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
March 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
834 discussions
Start a n
N
ew thread
Hans Leidekker : msi: Add some tests for MsiQueryFeatureState.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: c2221f325fdb383699b1469ade75c2a5e2b4d742 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c2221f325fdb383699b1469ad…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 13:52:04 2009 +0100 msi: Add some tests for MsiQueryFeatureState. These tests confirm that a feature is reported as advertised if only one of its components is missing. --- dlls/msi/tests/msi.c | 83 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 65 insertions(+), 18 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2221f325fdb383699b14…
1
0
0
0
Alexandre Julliard : kernel32: Revert incorrect part of commit 7c3529f1cc6a3ce6f0a403c337926c8fc9fbfc57.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: 79cd9183e810aab7f94ad5bbcf11406d27d16a94 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=79cd9183e810aab7f94ad5bbc…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 14:19:02 2009 +0100 kernel32: Revert incorrect part of commit 7c3529f1cc6a3ce6f0a403c337926c8fc9fbfc57. --- dlls/kernel32/profile.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 5d563a5..d44e819 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -208,9 +208,8 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING for (key = section->key; key; key = key->next) { - len += strlenW(key->name); - if (key->value && key->value[0]) len += strlenW(key->value); - len += 3; /* '=' and "\r\n" */ + len += strlenW(key->name) + 2; + if (key->value) len += strlenW(key->value) + 1; } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
1
0
0
0
Aric Stewart : advapi32: Stub TreeResetNamedSecurityInfo for the IE8 installer.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: df1203342c50116d687a65a4bb27abac410b12d9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=df1203342c50116d687a65a4b…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 25 07:24:13 2009 -0500 advapi32: Stub TreeResetNamedSecurityInfo for the IE8 installer. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 13 +++++++++++++ include/aclapi.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9d56c46..d641efd 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -640,7 +640,7 @@ @ stub TraceMessage @ stub TraceMessageVa # @ stub TreeResetNamedSecurityInfoA -# @ stub TreeResetNamedSecurityInfoW +@ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) # @ stub TrusteeAccessToObjectA # @ stub TrusteeAccessToObjectW # @ stub UninstallApplication diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 454c98f..a220ddb 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5207,3 +5207,16 @@ BOOL WINAPI SaferCreateLevel(DWORD ScopeId, DWORD LevelId, DWORD OpenFlags, FIXME("(%u, %x, %u, %p, %p) stub\n", ScopeId, LevelId, OpenFlags, LevelHandle, lpReserved); return FALSE; } + +DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, + PSID pOwner, PSID pGroup, PACL pDacl, PACL pSacl, + BOOL KeepExplicit, FN_PROGRESS fnProgress, + PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args) +{ + FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p Stub\n", + debugstr_w(pObjectName), ObjectType, SecurityInfo, pOwner, pGroup, + pDacl, pSacl, KeepExplicit, fnProgress, ProgressInvokeSetting, Args); + + return ERROR_SUCCESS; +} diff --git a/include/aclapi.h b/include/aclapi.h index fc2ff76..249cd03 100644 --- a/include/aclapi.h +++ b/include/aclapi.h @@ -28,6 +28,8 @@ extern "C" { #endif +typedef void (*FN_PROGRESS)(LPWSTR,DWORD,PPROG_INVOKE_SETTING,PVOID,BOOL); + WINADVAPI DWORD WINAPI GetExplicitEntriesFromAclA( PACL, PULONG, PEXPLICIT_ACCESS_A* ); WINADVAPI DWORD WINAPI GetExplicitEntriesFromAclW( PACL, PULONG, PEXPLICIT_ACCESS_W* ); #define GetExplicitEntriesFromAcl WINELIB_NAME_AW(GetExplicitEntriesFromAcl)
1
0
0
0
Alexandre Julliard : winebuild: Skip non-functions when building the undefined exports file.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: cdad788d3315a8759c581d768eb4f3a59ee0a739 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cdad788d3315a8759c581d768…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 13:27:27 2009 +0100 winebuild: Skip non-functions when building the undefined exports file. --- tools/winebuild/import.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 1cc3689..e782c99 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -510,7 +510,7 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; - if (odp->type == TYPE_STUB) continue; + if (odp->type == TYPE_STUB || odp->type == TYPE_ABS) continue; if (odp->flags & FLAG_FORWARD) continue; fprintf( f, "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); }
1
0
0
0
Patrick Gauthier : user32/tests: Check effect of magic font height value 0x7fff in dialog template.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: 08c0ddec80f557bba109c908389e25bf9cddab39 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=08c0ddec80f557bba109c9083…
Author: Patrick Gauthier <webmaster(a)korosoft.net> Date: Fri Mar 20 19:23:39 2009 -0400 user32/tests: Check effect of magic font height value 0x7fff in dialog template. --- dlls/user32/tests/dialog.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 84929e3..7f8dfae 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -36,6 +36,7 @@ #include "wine/test.h" #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #define MAXHWNDS 1024 @@ -926,6 +927,99 @@ static void test_DisabledDialogTest(void) ok(FALSE == g_terminated, "dialog with disabled ok button has been terminated\n"); } +static INT_PTR CALLBACK messageBoxFontDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, + LPARAM lParam) +{ + return (uiMsg == WM_INITDIALOG); +} + +static void test_MessageBoxFontTest(void) +{ + /* This dialog template defines a dialog template which got 0x7fff as its + * font size and omits the other font members. On WinNT, passing such a + * dialog template to CreateDialogIndirectParamW will result in a dialog + * being created which uses the message box font. We test that here. + */ + + static unsigned char dlgTemplate[] = + { + /* Dialog header */ + 0x01,0x00, /* Version */ + 0xff,0xff, /* Extended template marker */ + 0x00,0x00,0x00,0x00, /* Context Help ID */ + 0x00,0x00,0x00,0x00, /* Extended style */ + 0xc0,0x00,0xc8,0x80, /* Style (WS_SYSMENU|WS_CAPTION|WS_POPUP|DS_SETFONT|DS_MODALFRAME) */ + 0x01,0x00, /* Control count */ + 0x00,0x00, /* X */ + 0x00,0x00, /* Y */ + 0x80,0x00, /* Width */ + 0x80,0x00, /* Height */ + 0x00,0x00, /* Menu name */ + 0x00,0x00, /* Class name */ + 'T',0x00,'e',0x00, /* Caption (unicode) */ + 's',0x00,'t',0x00, + 0x00,0x00, + 0xff,0x7f, /* Font height (0x7fff = message box font) */ + + /* Control #1 */ + 0x00,0x00, /* Align to DWORD (header is 42 bytes) */ + 0x00,0x00,0x00,0x00, /* Context Help ID */ + 0x00,0x00,0x00,0x00, /* Extended style */ + 0x00,0x00,0x00,0x50, /* Style (WS_CHILD|WS_VISIBLE) */ + 0x00,0x00, /* X */ + 0x00,0x00, /* Y */ + 0x80,0x00, /* Width */ + 0x80,0x00, /* Height */ + 0x00,0x01,0x00,0x00, /* Control ID (256) */ + 0xff,0xff,0x82,0x00, /* Class (Static) */ + 'W',0x00,'I',0x00, /* Caption (unicode) */ + 'N',0x00,'E',0x00, + ' ',0x00,'d',0x00, + 'i',0x00,'a',0x00, + 'l',0x00,'o',0x00, + 'g',0x00,' ',0x00, + 't',0x00,'e',0x00, + 's',0x00,'t',0x00, + '.',0x00,0x00,0x00, + 0x00,0x00, /* Size of extended data */ + + 0x00,0x00 /* Align to DWORD */ + }; + + HWND hDlg; + HFONT hFont; + LOGFONTW lfStaticFont; + NONCLIENTMETRICSW ncMetrics; + + /* Check if the dialog can be created from the template. On Win9x, this should fail + * because we are calling the W function which is not implemented, but that's what + * we want, because passing such a template to CreateDialogIndirectParamA would crash + * anyway. + */ + hDlg = CreateDialogIndirectParamW(g_hinst, (LPCDLGTEMPLATE)dlgTemplate, NULL, messageBoxFontDlgWinProc, 0); + if (!hDlg) + { + todo_wine win_skip("dialog wasn't created\n"); + return; + } + + hFont = (HFONT) SendDlgItemMessageW(hDlg, 256, WM_GETFONT, 0, 0); + if (!hFont) + { + skip("dialog uses system font\n"); + DestroyWindow(hDlg); + return; + } + GetObjectW(hFont, sizeof(LOGFONTW), &lfStaticFont); + + ncMetrics.cbSize = sizeof(NONCLIENTMETRICSW); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, 0, &ncMetrics, 0); + ok( !memcmp(&lfStaticFont, &ncMetrics.lfMessageFont, FIELD_OFFSET(LOGFONTW, lfFaceName)) && + !lstrcmpW(lfStaticFont.lfFaceName, ncMetrics.lfMessageFont.lfFaceName), + "dialog doesn't use message box font\n"); + DestroyWindow(hDlg); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -939,4 +1033,5 @@ START_TEST(dialog) test_GetDlgItemText(); test_DialogBoxParamA(); test_DisabledDialogTest(); + test_MessageBoxFontTest(); }
1
0
0
0
Aric Stewart : msi: Verify the existence of fusion. dll before reporting the .Net version.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: 28bc76b5d3487a7a3cf26f5edea1e59472ea6916 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=28bc76b5d3487a7a3cf26f5ed…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 18 14:31:14 2009 -0500 msi: Verify the existence of fusion.dll before reporting the .Net version. Fixes an issue with .Net 3.0 where it does not install a new fusion.dll but does add a key to the registery. The fact that a new dll is not installed has been verified on windows. --- dlls/msi/package.c | 52 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b2c46a2..ec8495f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -220,7 +220,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) { HKEY netsetup; LONG res; - LPWSTR file; + LPWSTR file = NULL; DWORD index = 0, size; WCHAR ver[MAX_PATH]; WCHAR name[MAX_PATH]; @@ -243,34 +243,46 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (res != ERROR_SUCCESS) return NULL; + GetWindowsDirectoryW(windir, MAX_PATH); + ver[0] = '\0'; size = MAX_PATH; while (RegEnumKeyExW(netsetup, index, name, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { index++; - if (lstrcmpW(ver, name) < 0) - lstrcpyW(ver, name); - } - RegCloseKey(netsetup); - - if (!index) - return NULL; + /* verify existence of fusion.dll .Net 3.0 does not install a new one */ + if (lstrcmpW(ver, name) < 0) + { + LPWSTR check; + size = lstrlenW(windir) + lstrlenW(subdir) + lstrlenW(name) +lstrlenW(fusion) + 3; + check = msi_alloc(size * sizeof(WCHAR)); - GetWindowsDirectoryW(windir, MAX_PATH); + if (!check) + { + if (file) msi_free(file); + return NULL; + } - size = lstrlenW(windir) + lstrlenW(subdir) + lstrlenW(ver) +lstrlenW(fusion) + 3; - file = msi_alloc(size * sizeof(WCHAR)); - if (!file) - return NULL; + lstrcpyW(check, windir); + lstrcatW(check, backslash); + lstrcatW(check, subdir); + lstrcatW(check, name); + lstrcatW(check, backslash); + lstrcatW(check, fusion); - lstrcpyW(file, windir); - lstrcatW(file, backslash); - lstrcatW(file, subdir); - lstrcatW(file, ver); - lstrcatW(file, backslash); - lstrcatW(file, fusion); + if(GetFileAttributesW(check) != INVALID_FILE_ATTRIBUTES) + { + msi_free(file); + file = check; + lstrcpyW(ver, name); + } + else + msi_free(check); + } + } + RegCloseKey(netsetup); return file; }
1
0
0
0
Rein Klazes : user32: In MENU_SuspendPopup() make sure the right message is removed.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: d75b0cdc986f464f3067767cd53aca6b85feb366 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d75b0cdc986f464f3067767cd…
Author: Rein Klazes <wijn(a)online.nl> Date: Wed Mar 18 08:47:00 2009 +0100 user32: In MENU_SuspendPopup() make sure the right message is removed. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index fc6f981..ff6af76 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2841,7 +2841,7 @@ static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg ) msg.hwnd = pmt->hOwnerWnd; - PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE); + PeekMessageW( &msg, 0, uMsg, uMsg, PM_NOYIELD | PM_REMOVE); pmt->trackFlags |= TF_SKIPREMOVE; switch( uMsg )
1
0
0
0
Roman Mindalev : ntdll: Move search for assemblyIdentity element.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: 9925785eef43a04fd8b745c6ac4f05d0dcafbf0e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9925785eef43a04fd8b745c6a…
Author: Roman Mindalev <lists(a)r000n.net> Date: Fri Mar 13 20:16:35 2009 +0300 ntdll: Move search for assemblyIdentity element. --- dlls/ntdll/actctx.c | 60 ++++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f864033..3744904 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1390,37 +1390,6 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, assembly->no_inherit) return FALSE; - if (xmlstr_cmp(&elem, assemblyIdentityW)) - { - if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; - ret = next_xml_elem(xmlbuf, &elem); - - if (expected_ai) - { - /* FIXME: more tests */ - if (assembly->type == ASSEMBLY_MANIFEST && - memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) - { - FIXME("wrong version for assembly manifest: %u.%u.%u.%u / %u.%u.%u.%u\n", - expected_ai->version.major, expected_ai->version.minor, - expected_ai->version.build, expected_ai->version.revision, - assembly->id.version.major, assembly->id.version.minor, - assembly->id.version.build, assembly->id.version.revision); - return FALSE; - } - else if (assembly->type == ASSEMBLY_SHARED_MANIFEST && - (assembly->id.version.major != expected_ai->version.major || - assembly->id.version.minor != expected_ai->version.minor || - assembly->id.version.build < expected_ai->version.build || - (assembly->id.version.build == expected_ai->version.build && - assembly->id.version.revision < expected_ai->version.revision))) - { - FIXME("wrong version for shared assembly manifest\n"); - return FALSE; - } - } - } - while (ret) { if (xmlstr_cmp_end(&elem, assemblyW)) @@ -1452,6 +1421,35 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_clr_surrogate_elem(xmlbuf, assembly); } + else if (xmlstr_cmp(&elem, assemblyIdentityW)) + { + if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; + + if (expected_ai) + { + /* FIXME: more tests */ + if (assembly->type == ASSEMBLY_MANIFEST && + memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) + { + FIXME("wrong version for assembly manifest: %u.%u.%u.%u / %u.%u.%u.%u\n", + expected_ai->version.major, expected_ai->version.minor, + expected_ai->version.build, expected_ai->version.revision, + assembly->id.version.major, assembly->id.version.minor, + assembly->id.version.build, assembly->id.version.revision); + ret = FALSE; + } + else if (assembly->type == ASSEMBLY_SHARED_MANIFEST && + (assembly->id.version.major != expected_ai->version.major || + assembly->id.version.minor != expected_ai->version.minor || + assembly->id.version.build < expected_ai->version.build || + (assembly->id.version.build == expected_ai->version.build && + assembly->id.version.revision < expected_ai->version.revision))) + { + FIXME("wrong version for shared assembly manifest\n"); + ret = FALSE; + } + } + } else { WARN("unknown element %s\n", debugstr_xmlstr(&elem));
1
0
0
0
Roman Mindalev : ntdll: Free memory for type field of an assembly_identity.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: cbd935eff4f6634ebd2e1ba785ce0280d515743c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cbd935eff4f6634ebd2e1ba78…
Author: Roman Mindalev <lists(a)r000n.net> Date: Fri Mar 13 20:15:33 2009 +0300 ntdll: Free memory for type field of an assembly_identity. --- dlls/ntdll/actctx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 25c590a..f864033 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -338,6 +338,7 @@ static void free_assembly_identity(struct assembly_identity *ai) RtlFreeHeap( GetProcessHeap(), 0, ai->arch ); RtlFreeHeap( GetProcessHeap(), 0, ai->public_key ); RtlFreeHeap( GetProcessHeap(), 0, ai->language ); + RtlFreeHeap( GetProcessHeap(), 0, ai->type ); } static struct entity* add_entity(struct entity_array *array, DWORD kind)
1
0
0
0
Roman Mindalev : ntdll: Check for arch and name fields in assembly_identity structure.
by Alexandre Julliard
25 Mar '09
25 Mar '09
Module: wine Branch: master Commit: b653679e6a1dfd86ae5b457fb296ebe619e1b8c9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b653679e6a1dfd86ae5b457fb…
Author: Roman Mindalev <lists(a)r000n.net> Date: Fri Mar 13 20:14:03 2009 +0300 ntdll: Check for arch and name fields in assembly_identity structure. --- dlls/ntdll/actctx.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 79d475f..25c590a 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -496,17 +496,19 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai) static const WCHAR noneW[] = {'n','o','n','e',0}; static const WCHAR mskeyW[] = {'d','e','a','d','b','e','e','f',0}; + const WCHAR *arch = ai->arch ? ai->arch : noneW; const WCHAR *key = ai->public_key ? ai->public_key : noneW; const WCHAR *lang = ai->language ? ai->language : noneW; - SIZE_T size = (strlenW(ai->arch) + 1 + strlenW(ai->name) + 1 + strlenW(key) + 24 + 1 + - strlenW(lang) + 1) * sizeof(WCHAR) + sizeof(mskeyW); + const WCHAR *name = ai->name ? ai->name : noneW; + SIZE_T size = (strlenW(arch) + 1 + strlenW(name) + 1 + strlenW(key) + 24 + 1 + + strlenW(lang) + 1) * sizeof(WCHAR) + sizeof(mskeyW); WCHAR *ret; if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return NULL; - strcpyW( ret, ai->arch ); + strcpyW( ret, arch ); strcatW( ret, undW ); - strcatW( ret, ai->name ); + strcatW( ret, name ); strcatW( ret, undW ); strcatW( ret, key ); strcatW( ret, undW );
1
0
0
0
← Newer
1
...
15
16
17
18
19
20
21
...
84
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
Results per page:
10
25
50
100
200