winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2009
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
965 discussions
Start a n
N
ew thread
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
0
0
Igor Tarasov : comctl32: Make LISTVIEW_ProcessLetterKeys accept Unicode characters.
by Alexandre Julliard
19 Feb '09
19 Feb '09
Module: wine Branch: master Commit: 73b490b57da520d4cfd1aeb41d54fbea8c33c32c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=73b490b57da520d4cfd1aeb41…
Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Thu Feb 19 07:01:21 2009 +0400 comctl32: Make LISTVIEW_ProcessLetterKeys accept Unicode characters. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b8545fd..6b89766 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1530,7 +1530,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L if (!charCode || !keyData) return 0; /* only allow the valid WM_CHARs through */ - if (!isalnum(charCode) && + if (!isalnumW(charCode) && charCode != '.' && charCode != '`' && charCode != '!' && charCode != '@' && charCode != '#' && charCode != '$' && charCode != '%' && charCode != '^' && charCode != '&' &&
1
0
0
0
Artem Reznikov : shlwapi: Ukranian translation.
by Alexandre Julliard
19 Feb '09
19 Feb '09
Module: wine Branch: master Commit: 34e2848838b62738b6d24d793334873d706ad10a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=34e2848838b62738b6d24d793…
Author: Artem Reznikov <temarez(a)yandex.ru> Date: Thu Feb 19 14:41:09 2009 +0100 shlwapi: Ukranian translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Uk.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 2a205fe..d159dab 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -46,4 +46,5 @@ #include "shlwapi_Sk.rc" #include "shlwapi_Sv.rc" #include "shlwapi_Tr.rc" +#include "shlwapi_Uk.rc" #include "shlwapi_Zh.rc" diff --git a/dlls/shlwapi/shlwapi_Uk.rc b/dlls/shlwapi/shlwapi_Uk.rc new file mode 100644 index 0000000..a8a1e3d --- /dev/null +++ b/dlls/shlwapi/shlwapi_Uk.rc @@ -0,0 +1,43 @@ +/* + * Ukranian resources for shlwapi + * + * Copyright 2007 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�������!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "&������ �� ���������� �� �����������", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&���������" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&���" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&ͳ" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld ����" + IDS_TIME_INTERVAL_HOURS " ���" + IDS_TIME_INTERVAL_MINUTES " ��" + IDS_TIME_INTERVAL_SECONDS " ���." +}
1
0
0
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
0
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
0
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
0
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
0
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
0
0
Hans Leidekker : fusion: Don't trace contents of an out parameter.
by Alexandre Julliard
19 Feb '09
19 Feb '09
Module: wine Branch: master Commit: b386e3ad741da4368e587d0277ad539db65f8c4c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b386e3ad741da4368e587d027…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:04:58 2009 +0100 fusion: Don't trace contents of an out parameter. --- dlls/fusion/asmname.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index b028baa..913674a 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -209,7 +209,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, { IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; - TRACE("(%p, %s, %p, %d)\n", iface, debugstr_w(szDisplayName), + TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags); if (!name->displayname || !*name->displayname)
1
0
0
0
Hans Leidekker : fusion: Allow spaces between attribute-value pairs in an assembly name.
by Alexandre Julliard
19 Feb '09
19 Feb '09
Module: wine Branch: master Commit: f6bfbfb6dfe7f786f9e9d3262131e66856d23822 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f6bfbfb6dfe7f786f9e9d3262…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:04:41 2009 +0100 fusion: Allow spaces between attribute-value pairs in an assembly name. --- dlls/fusion/asmname.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index e90dff1..b028baa 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -454,6 +454,8 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam *ptr2 = '\0'; + while (*str == ' ') str++; + if (!lstrcmpW(str, version)) hr = parse_version(name, ptr); else if (!lstrcmpW(str, culture))
1
0
0
0
← Newer
1
...
29
30
31
32
33
34
35
...
97
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
Results per page:
10
25
50
100
200