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 2010
----- 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
783 discussions
Start a n
N
ew thread
Nikolay Sivov : msxml3: Accept PI node in on base name request.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: 875c9c71ab8d8b8e3695ebea277b87b39ddd49f4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=875c9c71ab8d8b8e3695ebea2…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 10 15:12:39 2010 +0300 msxml3: Accept PI node in on base name request. --- dlls/msxml3/node.c | 17 +++++++++-------- dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d486bd9..da9afd2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -250,16 +250,16 @@ static HRESULT WINAPI xmlnode_get_nodeName( str = (const xmlChar*) "#document-fragment"; break; case XML_TEXT_NODE: - str = (const xmlChar*) "#text"; - break; + str = (const xmlChar*) "#text"; + break; case XML_DOCUMENT_NODE: - str = (const xmlChar*) "#document"; - break; - case XML_ATTRIBUTE_NODE: - case XML_ELEMENT_NODE: - case XML_PI_NODE: + str = (const xmlChar*) "#document"; + break; + case XML_ATTRIBUTE_NODE: + case XML_ELEMENT_NODE: + case XML_PI_NODE: str = This->node->name; - break; + break; default: FIXME("nodeName not mapped correctly (%d)\n", This->node->type); str = This->node->name; @@ -1622,6 +1622,7 @@ static HRESULT WINAPI xmlnode_get_baseName( { case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: + case XML_PI_NODE: str = bstr_from_xmlChar( This->node->name ); r = S_OK; break; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bf2e234..1b134af 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1032,6 +1032,13 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); SysFreeString(str); + /* test baseName */ + str = (BSTR)0x1; + r = IXMLDOMProcessingInstruction_get_baseName(nodePI, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); + SysFreeString(str); + /* test Target */ r = IXMLDOMProcessingInstruction_get_target(nodePI, &str); ok(r == S_OK, "ret %08x\n", r );
1
0
0
0
Michael Stefaniuc : kernel32: Avoid using HIWORD on types that are 64bit on Win64.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: 3f37e33497ab6f61cffee53a0f479516404c2dd7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3f37e33497ab6f61cffee53a0…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 10 11:43:37 2010 +0100 kernel32: Avoid using HIWORD on types that are 64bit on Win64. --- dlls/kernel32/atom.c | 3 ++- dlls/kernel32/except.c | 2 +- dlls/kernel32/module.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c index d6caec2..a8deb5e 100644 --- a/dlls/kernel32/atom.c +++ b/dlls/kernel32/atom.c @@ -37,6 +37,7 @@ #include "kernel_private.h" #define MAX_ATOM_LEN 255 +#define IS_INTATOM(x) (((ULONG_PTR)(x) >> 16) == 0) /****************************************************************** * get_local_table @@ -88,7 +89,7 @@ BOOL WINAPI InitAtomTable( DWORD entries ) */ static inline BOOL check_integral_atom( const void* ptr, ATOM* patom) { - if (HIWORD( ptr )) return FALSE; + if (!IS_INTATOM( ptr )) return FALSE; if ((*patom = LOWORD( ptr )) >= MAXINTATOM) { SetLastError( ERROR_INVALID_PARAMETER ); diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index d6dea99..6ed88ad 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -133,7 +133,7 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in rec->ExceptionInformation[0]); break; case EXCEPTION_WINE_STUB: - if (HIWORD(rec->ExceptionInformation[1])) + if ((ULONG_PTR)rec->ExceptionInformation[1] >> 16) len = snprintf( buffer, size, "Unimplemented function %s.%s called", (char *)rec->ExceptionInformation[0], (char *)rec->ExceptionInformation[1] ); else diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 96a240e..2b8f11e 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1032,7 +1032,7 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) if (!hModule) hModule = NtCurrentTeb()->Peb->ImageBaseAddress; - if (HIWORD(function)) + if ((ULONG_PTR)function >> 16) { ANSI_STRING str;
1
0
0
0
Michael Stefaniuc : kernel32: Don' t use HIWORD to check for swapped args in GetCurrentDirectoryA.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: 0f5d042ff2dd0bdb5abc7249af04fc3e388bae79 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0f5d042ff2dd0bdb5abc7249a…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 10 12:11:53 2010 +0100 kernel32: Don't use HIWORD to check for swapped args in GetCurrentDirectoryA. --- dlls/kernel32/path.c | 4 ++-- dlls/kernel32/tests/path.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 0a02681..d77ecc1 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1400,13 +1400,13 @@ UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf ) WCHAR bufferW[MAX_PATH]; DWORD ret; - if (buflen && buf && !HIWORD(buf)) + if (buflen && buf && ((ULONG_PTR)buf >> 16) == 0) { /* Win9x catches access violations here, returning zero. * This behaviour resulted in some people not noticing * that they got the argument order wrong. So let's be * nice and fail gracefully if buf is invalid and looks - * more like a buflen (which is probably MAX_PATH). */ + * more like a buflen. */ SetLastError(ERROR_INVALID_PARAMETER); return 0; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e533bd0..be01948 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -467,6 +467,16 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); HeapFree( GetProcessHeap(), 0, buffer ); +/* Check for crash prevention on swapped args. Crashes all but Win9x. +*/ + if (0) + { + SetLastError( 0xdeadbeef ); + len = GetCurrentDirectoryA( 42, (LPSTR)(MAX_PATH + 42) ); + ok( len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, + "GetCurrentDirectoryA failed to fail %u err %u\n", len, GetLastError() ); + } + /* SetCurrentDirectoryA shouldn't care whether the string has a trailing '\\' or not */
1
0
0
0
Michael Stefaniuc : oleaut32: Avoid using HIWORD on string pointers.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: ef7cafc11c3a7ecf8fa0fa98c92dd4133660834e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ef7cafc11c3a7ecf8fa0fa98c…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 10 11:44:10 2010 +0100 oleaut32: Avoid using HIWORD on string pointers. --- dlls/oleaut32/typelib.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3095d4f..2ad5412 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1013,7 +1013,7 @@ typedef struct tagTLBFuncDesc int helpcontext; int HelpStringContext; BSTR HelpString; - BSTR Entry; /* if its Hiword==0, it numeric; -1 is not present*/ + BSTR Entry; /* if IS_INTRESOURCE true, it's numeric; if -1 it isn't present */ int ctCustData; TLBCustData * pCustData; /* linked list to cust data; */ struct tagTLBFuncDesc * next; @@ -1899,8 +1899,8 @@ MSFT_DoFuncs(TLBContext* pcx, { if ( pFuncRec->FKCCIC & 0x2000 ) { - if (HIWORD(pFuncRec->OptAttr[2]) != 0) - ERR("ordinal 0x%08x invalid, HIWORD != 0\n", pFuncRec->OptAttr[2]); + if (!IS_INTRESOURCE(pFuncRec->OptAttr[2])) + ERR("ordinal 0x%08x invalid, IS_INTRESOURCE is false\n", pFuncRec->OptAttr[2]); (*pptfd)->Entry = (BSTR)pFuncRec->OptAttr[2]; } else @@ -2493,7 +2493,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /* Find resource */ typeInfo = (NE_TYPEINFO *)(resTab + 2); - if (HIWORD(typeid) != 0) /* named type */ + if (!IS_INTRESOURCE(typeid)) /* named type */ { BYTE len = strlen( typeid ); while (typeInfo->type_id) @@ -2524,7 +2524,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, found_type: nameInfo = (NE_NAMEINFO *)(typeInfo + 1); - if (HIWORD(resid) != 0) /* named resource */ + if (!IS_INTRESOURCE(resid)) /* named resource */ { BYTE len = strlen( resid ); for (count = typeInfo->count; count > 0; count--, nameInfo++) @@ -4976,7 +4976,7 @@ static void ITypeInfo_fnDestroy(ITypeInfoImpl *This) TLB_Free(pFInfo->funcdesc.lprgelemdescParam); TLB_Free(pFInfo->pParamDesc); TLB_FreeCustData(pFInfo->pCustData); - if (HIWORD(pFInfo->Entry) != 0 && pFInfo->Entry != (BSTR)-1) + if (!IS_INTRESOURCE(pFInfo->Entry) && pFInfo->Entry != (BSTR)-1) SysFreeString(pFInfo->Entry); SysFreeString(pFInfo->HelpString); SysFreeString(pFInfo->Name); @@ -6571,7 +6571,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid if (pBstrDllName) *pBstrDllName = SysAllocString(This->DllName); - if (HIWORD(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) { + if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) { if (pBstrName) *pBstrName = SysAllocString(pFDesc->Entry); if (pwOrdinal)
1
0
0
0
Michael Stefaniuc : ntdll: Avoid using HIWORD on types that are 64bit on Win64.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: 5cc31118083c86646e4ac894f9e52c8e57afdb3a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5cc31118083c86646e4ac894f…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 10 11:43:59 2010 +0100 ntdll: Avoid using HIWORD on types that are 64bit on Win64. --- dlls/ntdll/atom.c | 5 +++-- dlls/ntdll/relay.c | 5 +++-- dlls/ntdll/resource.c | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/atom.c b/dlls/ntdll/atom.c index 27e27a2..8ac4b97 100644 --- a/dlls/ntdll/atom.c +++ b/dlls/ntdll/atom.c @@ -39,7 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(atom); -#define MAX_ATOM_LEN 255 +#define MAX_ATOM_LEN 255 +#define IS_INTATOM(x) (((ULONG_PTR)(x) >> 16) == 0) /****************************************************************** * is_integral_atom @@ -51,7 +52,7 @@ static NTSTATUS is_integral_atom( LPCWSTR atomstr, size_t len, RTL_ATOM* pAtom ) { RTL_ATOM atom; - if (HIWORD( atomstr )) + if (!IS_INTATOM( atomstr )) { const WCHAR* ptr = atomstr; if (!len) return STATUS_OBJECT_NAME_INVALID; diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 7fd3c35..ee042de 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -52,6 +52,7 @@ struct relay_descr /* descriptor for a module */ }; #define RELAY_DESCR_MAGIC ((void *)0xdeb90001) +#define IS_INTARG(x) (((ULONG_PTR)(x) >> 16) == 0) /* private data built at dll load time */ @@ -303,7 +304,7 @@ static inline void RELAY_PrintArgs( const INT_PTR *args, int nb_args, unsigned i { while (nb_args--) { - if ((typemask & 3) && HIWORD(*args)) + if ((typemask & 3) && !IS_INTARG(*args)) { if (typemask & 2) DPRINTF( "%08lx %s", *args, debugstr_w((LPCWSTR)*args) ); @@ -880,7 +881,7 @@ static void SNOOP_PrintArg(DWORD x) int i,nostring; DPRINTF("%08x",x); - if (!HIWORD(x) || TRACE_ON(seh)) return; /* trivial reject to avoid faults */ + if (IS_INTARG(x) || TRACE_ON(seh)) return; /* trivial reject to avoid faults */ __TRY { LPBYTE s=(LPBYTE)x; diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index ff0a5d0..f93a705 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -49,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); static LCID user_lcid, system_lcid; static LANGID user_ui_language, system_ui_language; +#define IS_INTRESOURCE(x) (((ULONG_PTR)(x) >> 16) == 0) + /********************************************************************** * is_data_file_module * @@ -142,7 +144,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ const IMAGE_RESOURCE_DIR_STRING_U *str; int min, max, res, pos, namelen; - if (!HIWORD(name)) return find_entry_by_id( dir, LOWORD(name), root, want_dir ); + if (IS_INTRESOURCE(name)) return find_entry_by_id( dir, LOWORD(name), root, want_dir ); entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); namelen = strlenW(name); min = 0;
1
0
0
0
Hans Leidekker : msi: Add a partial implementation of the ValidateProductID standard action.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: 068cb1291b11965b69464b5621bd5e36cd1af8d6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=068cb1291b11965b69464b562…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 11:55:59 2010 +0100 msi: Add a partial implementation of the ValidateProductID standard action. --- dlls/msi/action.c | 31 ++++++++++++---- dlls/msi/events.c | 3 -- dlls/msi/msipriv.h | 3 ++ dlls/msi/tests/install.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0d938c2..76910f3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6125,6 +6125,30 @@ done: return r; } +static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) +{ + LPWSTR key, template, id; + UINT r = ERROR_SUCCESS; + + id = msi_dup_property( package, szProductID ); + if (id) + { + msi_free( id ); + return ERROR_SUCCESS; + } + template = msi_dup_property( package, szPIDTemplate ); + key = msi_dup_property( package, szPIDKEY ); + + if (key && template) + { + FIXME( "partial stub: template %s key %s\n", debugstr_w(template), debugstr_w(key) ); + r = MSI_SetPropertyW( package, szProductID, key ); + } + msi_free( template ); + msi_free( key ); + return r; +} + static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) { TRACE("\n"); @@ -6206,13 +6230,6 @@ static UINT ACTION_MigrateFeatureStates( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "MigrateFeatureStates", table ); } -static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { - 'P','r','o','d','u','c','t','I','D',0 }; - return msi_unimplemented_action_stub( package, "ValidateProductID", table ); -} - static UINT ACTION_RemoveEnvironmentStrings( MSIPACKAGE *package ) { static const WCHAR table[] = { diff --git a/dlls/msi/events.c b/dlls/msi/events.c index f4697dd..e8f2297 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -386,9 +386,6 @@ static UINT ControlEvent_ReinstallMode(MSIPACKAGE *package, LPCWSTR argument, static UINT ControlEvent_ValidateProductID(MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog) { - static const WCHAR szProductID[] = {'P','r','o','d','u','c','t','I','D',0}; - static const WCHAR szPIDTemplate[] = {'P','I','D','T','e','m','p','l','a','t','e',0}; - static const WCHAR szPIDKEY[] = {'P','I','D','K','E','Y',0}; LPWSTR key, template; UINT ret = ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2955715..f81184b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1072,6 +1072,9 @@ static const WCHAR szFindRelatedProducts[] = {'F','i','n','d','R','e','l','a','t static const WCHAR szAllUsers[] = {'A','L','L','U','S','E','R','S',0}; static const WCHAR szCustomActionData[] = {'C','u','s','t','o','m','A','c','t','i','o','n','D','a','t','a',0}; static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; +static const WCHAR szProductID[] = {'P','r','o','d','u','c','t','I','D',0}; +static const WCHAR szPIDTemplate[] = {'P','I','D','T','e','m','p','l','a','t','e',0}; +static const WCHAR szPIDKEY[] = {'P','I','D','K','E','Y',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8a3840f..3add46c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1220,6 +1220,46 @@ static const CHAR font_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t6400\n" "InstallFinalize\t\t6600"; +static const CHAR vp_property_dat[] = "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "HASUIRUN\t0\n" + "INSTALLLEVEL\t3\n" + "InstallMode\tTypical\n" + "Manufacturer\tWine\n" + "PIDTemplate\t###-#######\n" + "ProductCode\t{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}\n" + "ProductLanguage\t1033\n" + "ProductName\tMSITEST\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"; + +static const CHAR vp_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "SetProductID1\t51\tProductID\t1\t\n" + "SetProductID2\t51\tProductID\t2\t\n" + "TestProductID1\t19\t\t\tHalts installation\n" + "TestProductID2\t19\t\t\tHalts installation\n"; + +static const CHAR vp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "SetProductID1\tSET_PRODUCT_ID=1\t3000\n" + "SetProductID2\tSET_PRODUCT_ID=2\t3100\n" + "ValidateProductID\t\t3200\n" + "InstallExecute\t\t3300\n" + "TestProductID1\tProductID=1\t3400\n" + "TestProductID2\tProductID=\"123-1234567\"\t3500\n" + "InstallFiles\t\t4000\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2003,6 +2043,19 @@ static const msi_table font_tables[] = ADD_TABLE(property) }; +static const msi_table vp_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(vp_custom_action), + ADD_TABLE(vp_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(vp_property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -7811,6 +7864,43 @@ static void test_register_font(void) delete_test_files(); } +static void test_validate_product_id(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, vp_tables, sizeof(vp_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "SET_PRODUCT_ID=1"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + r = MsiInstallProductA(msifile, "SET_PRODUCT_ID=2"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "PIDKEY=123-1234567"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -7908,6 +7998,7 @@ START_TEST(install) test_delete_services(); test_self_registration(); test_register_font(); + test_validate_product_id(); DeleteFileA(log_file);
1
0
0
0
Hans Leidekker : msi: Implement the UnregisterFonts standard action.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: 7331b3ca9821a33f62369835c54a94c294512eb2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7331b3ca9821a33f62369835c…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 11:55:31 2010 +0100 msi: Implement the UnregisterFonts standard action. --- dlls/msi/action.c | 6 --- dlls/msi/font.c | 109 +++++++++++++++++++++++++++++++++++++++------ dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 208 insertions(+), 20 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=7331b3ca9821a33f62369…
1
0
0
0
Hans Leidekker : msi: Add stub implementations of the DisableRollback and InstallAdminPackage standard actions .
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: 5df62d0c42006f312b886f596a13c62da95e2380 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5df62d0c42006f312b886f596…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 11:54:57 2010 +0100 msi: Add stub implementations of the DisableRollback and InstallAdminPackage standard actions. --- dlls/msi/action.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d94d842..43c0fdc 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6132,6 +6132,24 @@ static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) return ERROR_SUCCESS; } +static UINT ACTION_AllocateRegistrySpace( MSIPACKAGE *package ) +{ + TRACE("%p\n", package); + return ERROR_SUCCESS; +} + +static UINT ACTION_DisableRollback( MSIPACKAGE *package ) +{ + FIXME("%p\n", package); + return ERROR_SUCCESS; +} + +static UINT ACTION_InstallAdminPackage( MSIPACKAGE *package ) +{ + FIXME("%p\n", package); + return ERROR_SUCCESS; +} + static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) { @@ -6156,12 +6174,6 @@ static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, return ERROR_SUCCESS; } -static UINT ACTION_AllocateRegistrySpace( MSIPACKAGE *package ) -{ - TRACE("%p\n", package); - return ERROR_SUCCESS; -} - static UINT ACTION_RemoveIniValues( MSIPACKAGE *package ) { static const WCHAR table[] = @@ -6335,13 +6347,13 @@ StandardActions[] = { szCreateFolders, ACTION_CreateFolders }, { szCreateShortcuts, ACTION_CreateShortcuts }, { szDeleteServices, ACTION_DeleteServices }, - { szDisableRollback, NULL }, + { szDisableRollback, ACTION_DisableRollback }, { szDuplicateFiles, ACTION_DuplicateFiles }, { szExecuteAction, ACTION_ExecuteAction }, { szFileCost, ACTION_FileCost }, { szFindRelatedProducts, ACTION_FindRelatedProducts }, { szForceReboot, ACTION_ForceReboot }, - { szInstallAdminPackage, NULL }, + { szInstallAdminPackage, ACTION_InstallAdminPackage }, { szInstallExecute, ACTION_InstallExecute }, { szInstallExecuteAgain, ACTION_InstallExecute }, { szInstallFiles, ACTION_InstallFiles},
1
0
0
0
Kusanagi Kouichi : notepad: Increase the text limit.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: 3b6c20e48692de94ad52870022775c90e1fd52f8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3b6c20e48692de94ad5287002…
Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Feb 10 19:54:42 2010 +0900 notepad: Increase the text limit. --- programs/notepad/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index d45fac7..1ddd95c 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -536,6 +536,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, Globals.hFont = CreateFontIndirectW(&Globals.lfFont); SendMessageW(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); + SendMessageW(Globals.hEdit, EM_LIMITTEXT, 0, 0); break; }
1
0
0
0
Alexandre Julliard : urlmon: Don' t create empty default key values where not necessary.
by Alexandre Julliard
10 Feb '10
10 Feb '10
Module: wine Branch: master Commit: fab57fe01850136facfe6344d8c2f4e24431df63 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fab57fe01850136facfe6344d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 14:30:24 2010 +0100 urlmon: Don't create empty default key values where not necessary. --- dlls/urlmon/urlmon.inf | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/urlmon.inf b/dlls/urlmon/urlmon.inf index 4d781c7..c9debb4 100644 --- a/dlls/urlmon/urlmon.inf +++ b/dlls/urlmon/urlmon.inf @@ -43,7 +43,6 @@ HKCR,"PROTOCOLS\Filter\lzdhtml","CLSID",,"%CLSID_DeCompMimeFilter%" [ZoneMap.Reg] -HKCU,"Software\Microsoft\Windows\CurrentVersion\Internet Settings",,, HKCU,"%PATH_ZONEMAP%",,, HKLM,"%PATH_ZONEMAP%",,, HKCU,"%PATH_ZONEMAP%","ProxyByPass", 0x10001,0x1
1
0
0
0
← Newer
1
...
37
38
39
40
41
42
43
...
79
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
Results per page:
10
25
50
100
200