July 2006 - Wine-commits - list.winehq.org

James Hawkins : msi: Add tests for component and feature states.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: dc0aad523ba7fa6fcb511ed9f080d3807b5b4cc8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc0aad523ba7fa6fcb511ed… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 21 14:46:17 2006 -0700 msi: Add tests for component and feature states. --- dlls/msi/tests/package.c | 453 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 453 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=dc0aad523ba7fa6fcb5…

1 0

Louis. Lenders : shell32: Define one more avi resource.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: e41cd2ff140b8288256b70f810f190aabbdeda4d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e41cd2ff140b8288256b70f… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Jul 22 12:34:37 2006 +0100 shell32: Define one more avi resource. --- dlls/shell32/shres.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 4d83f2a..a3a38d6 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -12037,6 +12037,9 @@ IDR_AVI_SEARCHING AVI searching.avi /* BINRES search.avi */ IDR_AVI_SEARCH AVI searching.avi +/* BINRES filemove.avi */ +IDR_AVI_FILEMOVE AVI searching.avi + /* BINRES filecopy.avi */ IDR_AVI_FILECOPY AVI searching.avi diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7acd382..53455ed 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -128,6 +128,7 @@ (also to limit shell32's size) */ #define IDR_AVI_SEARCH 150 #define IDR_AVI_SEARCHING 151 +#define IDR_AVI_FILEMOVE 160 #define IDR_AVI_FILECOPY 161 #endif

1 0

Jacek Caban : shdocvw: Return S_OK in IPersistStreamInit::Load.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 9dc2563aaa8989109f3a8fe9db581c8fcd2df07e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9dc2563aaa8989109f3a8fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 22 15:13:36 2006 +0200 shdocvw: Return S_OK in IPersistStreamInit::Load. --- dlls/shdocvw/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/persist.c b/dlls/shdocvw/persist.c index 3a08447..04afb42 100644 --- a/dlls/shdocvw/persist.c +++ b/dlls/shdocvw/persist.c @@ -148,7 +148,7 @@ static HRESULT WINAPI PersistStreamInit_ { WebBrowser *This = PERSTRINIT_THIS(iface); FIXME("(%p)->(%p)\n", This, pStg); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStg,

1 0

Jacek Caban : urlmon: Don't use freed string in TRACE.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: a04ffc3795915c76e1ddc627ebfa04e1ad9dc164 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a04ffc3795915c76e1ddc62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 22 15:21:20 2006 +0200 urlmon: Don't use freed string in TRACE. --- dlls/urlmon/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index dd0cd27..df27967 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -74,7 +74,7 @@ static HRESULT get_protocol_iface(LPCWST res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkey); HeapFree(GetProcessHeap(), 0, wszKey); if(res != ERROR_SUCCESS) { - TRACE("Could not open key %s\n", debugstr_w(wszKey)); + TRACE("Could not open protocol handler key\n"); return E_FAIL; }

1 0

Robert Reif : winnt.h: Add more SID defines.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 11370742b55678357902e429329d9cad865c9149 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11370742b55678357902e42… Author: Robert Reif <reif(a)earthlink.net> Date: Sun Jul 23 08:25:24 2006 -0400 winnt.h: Add more SID defines. --- include/winnt.h | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1ee3bd2..c8eca8f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3351,6 +3351,20 @@ #define SECURITY_NETWORK_SERVICE_RID #define SECURITY_NT_NON_UNIQUE 0x00000015L #define SECURITY_BUILTIN_DOMAIN_RID 0x00000020L +#define SECURITY_PACKAGE_BASE_RID 0x00000040L +#define SECURITY_PACKAGE_NTLM_RID 0x0000000AL +#define SECURITY_PACKAGE_SCHANNEL_RID 0x0000000EL +#define SECURITY_PACKAGE_DIGEST_RID 0x00000015L +#define SECURITY_MAX_ALWAYS_FILTERED 0x000003E7L +#define SECURITY_MIN_NEVER_FILTERED 0x000003E8L +#define SECURITY_OTHER_ORGANIZATION_RID 0x000003E8L + +#define FOREST_USER_RID_MAX 0x000001F3L +#define DOMAIN_USER_RID_ADMIN 0x000001F4L +#define DOMAIN_USER_RID_GUEST 0x000001F5L +#define DOMAIN_USER_RID_KRBTGT 0x000001F6L +#define DOMAIN_USER_RID_MAX 0x000003E7L + #define DOMAIN_GROUP_RID_ADMINS 0x00000200L #define DOMAIN_GROUP_RID_USERS 0x00000201L #define DOMAIN_GROUP_RID_GUESTS 0x00000202L @@ -3380,7 +3394,8 @@ #define DOMAIN_ALIAS_RID_DCOM_USERS #define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID -#define SECURITY_LOGON_IDS_RID_COUNT (3L) +#define SECURITY_PACKAGE_RID_COUNT 2L +#define SECURITY_LOGON_IDS_RID_COUNT 3L typedef enum { WinNullSid = 0,

1 0

Piotr Caban : oleview: Added interface handling to idl display.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 9e740600c3fcd337b035e88597ecdd5c270c8a23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e740600c3fcd337b035e88… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 21 21:11:27 2006 +0200 oleview: Added interface handling to idl display. --- programs/oleview/typelib.c | 138 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 136 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index c516a6a..7f32cfe 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -39,8 +39,11 @@ static const WCHAR wszOpenBrackets2[] = static const WCHAR wszCloseBrackets2[] = { ')','\0' }; static const WCHAR wszOpenBrackets3[] = { '{','\0' }; static const WCHAR wszCloseBrackets3[] = { '}','\0' }; +static const WCHAR wszInvertedComa[] = { '"','\0' }; +static const WCHAR wszColon[] = { ':','\0' }; static const WCHAR wszUUID[] = { 'u','u','i','d','\0' }; +static const WCHAR wszOdl[] = { 'o','d','l','\0' }; static const WCHAR wszVT_BOOL[] = { 'V','A','R','I','A','N','T','_','B','O','O','L','\0' }; @@ -91,6 +94,7 @@ LPARAM InitializeTLData(void) memset(pTLData, 0, sizeof(TYPELIB_DATA)); pTLData->idl = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + pTLData->idl[0] = '\0'; return (LPARAM)pTLData; } @@ -103,6 +107,8 @@ void AddChildrenData(HTREEITEM hParent, memset(&tvi, 0, sizeof(&tvi)); hCur = TreeView_GetChild(typelib.hTree, hParent); + if(!hCur) return; + do { tvi.hItem = hCur; @@ -294,6 +300,122 @@ int EnumImplTypes(ITypeInfo *pTypeInfo, return 0; } +void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wszName, + WCHAR *wszHelpString, TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData) +{ + ITypeInfo *pRefTypeInfo; + HREFTYPE hRefType; + BSTR bstrName; + WCHAR wszGuid[MAX_LOAD_STRING]; + BOOL bFirst; + + const WCHAR wszInterface[] = { 'I','n','t','e','r','f','a','c','e',' ','\0' }; + const WCHAR wszHelpstring[] = { 'h','e','l','p','s','t','r','i','n','g','\0' }; + const WCHAR wszTYPEFLAG_FAPPOBJECT[] = { 'a','p','p','o','b','j','e','c','t','\0' }; + const WCHAR wszTYPEFLAG_FCANCREATE[] = { 'c','a','n','c','r','e','a','t','e','\0' }; + const WCHAR wszTYPEFLAG_FLICENSED[] = { 'l','i','c','e','n','s','e','d','\0' }; + const WCHAR wszTYPEFLAG_FPREDECLID[] = { 'p','r','e','d','e','c','l','i','d','\0' }; + const WCHAR wszTYPEFLAG_FHIDDEN[] = { 'h','i','d','d','e','n','\0' }; + const WCHAR wszTYPEFLAG_FCONTROL[] = { 'c','o','n','t','r','o','l','\0' }; + const WCHAR wszTYPEFLAG_FDUAL[] = { 'd','u','a','l','\0' }; + const WCHAR wszTYPEFLAG_FNONEXTENSIBLE[] + = { 'n','o','n','e','x','t','e','n','s','i','b','l','e','\0' }; + const WCHAR wszTYPEFLAG_FOLEAUTOMATION[] + = { 'o','l','e','a','u','t','o','m','a','t','i','o','n','\0' }; + const WCHAR wszTYPEFLAG_FRESTRICTED[] + = { 'r','e','s','t','r','i','c','t','e','d','\0' }; + const WCHAR wszTYPEFLAG_FAGGREGATABLE[] + = { 'a','g','g','r','e','g','a','t','a','b','l','e','\0' }; + const WCHAR wszTYPEFLAG_FREPLACEABLE[] + = { 'r','e','p','l','a','c','a','b','l','e','\0' }; + const WCHAR wszTYPEFLAG_FDISPATCHABLE[] + = { 'd','i','s','p','a','t','c','h','a','b','l','e','\0' }; + const WCHAR wszTYPEFLAG_FREVERSEBIND[] + = { 'r','e','v','e','r','s','e','b','i','n','d','\0' }; + const WCHAR wszTYPEFLAG_FPROXY[] = { 'p','r','o','x','y','\0' }; + + AddToTLDataStrW(pTLData, wszOpenBrackets1); + AddToTLDataStrW(pTLData, wszNewLine); + AddToTLDataStrW(pTLData, wszOdl); + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszNewLine); + AddToTLDataStrW(pTLData, wszUUID); + AddToTLDataStrW(pTLData, wszOpenBrackets2); + StringFromGUID2(&(pTypeAttr->guid), wszGuid, MAX_LOAD_STRING); + wszGuid[lstrlenW(wszGuid)-1] = '\0'; + AddToTLDataStrW(pTLData, &wszGuid[1]); + AddToTLDataStrW(pTLData, wszCloseBrackets2); + if(wszHelpString) + { + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszNewLine); + AddToTLDataStrW(pTLData, wszHelpstring); + AddToTLDataStrW(pTLData, wszOpenBrackets2); + AddToTLDataStrW(pTLData, wszInvertedComa); + AddToTLDataStrW(pTLData, wszHelpString); + AddToTLDataStrW(pTLData, wszInvertedComa); + AddToTLDataStrW(pTLData, wszCloseBrackets2); + } + if(pTypeAttr->wTypeFlags) + { + bFirst = TRUE; + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszNewLine); +#define ENUM_FLAGS(x) if(pTypeAttr->wTypeFlags & x)\ + {\ + if(!bFirst)\ + {\ + AddToTLDataStrW(pTLData, wszComa);\ + AddToTLDataStrW(pTLData, wszSpace);\ + }\ + bFirst = FALSE;\ + AddToTLDataStrW(pTLData, wsz##x);\ + } + ENUM_FLAGS(TYPEFLAG_FAPPOBJECT); + ENUM_FLAGS(TYPEFLAG_FCANCREATE); + ENUM_FLAGS(TYPEFLAG_FLICENSED); + ENUM_FLAGS(TYPEFLAG_FPREDECLID); + ENUM_FLAGS(TYPEFLAG_FHIDDEN); + ENUM_FLAGS(TYPEFLAG_FCONTROL); + ENUM_FLAGS(TYPEFLAG_FDUAL); + ENUM_FLAGS(TYPEFLAG_FNONEXTENSIBLE); + ENUM_FLAGS(TYPEFLAG_FOLEAUTOMATION); + ENUM_FLAGS(TYPEFLAG_FRESTRICTED); + ENUM_FLAGS(TYPEFLAG_FAGGREGATABLE); + ENUM_FLAGS(TYPEFLAG_FREPLACEABLE); + ENUM_FLAGS(TYPEFLAG_FDISPATCHABLE); + ENUM_FLAGS(TYPEFLAG_FREVERSEBIND); + ENUM_FLAGS(TYPEFLAG_FPROXY); + } + AddToTLDataStrW(pTLData, wszNewLine); + AddToTLDataStrW(pTLData, wszCloseBrackets1); + AddToTLDataStrW(pTLData, wszNewLine); + AddToTLDataStrW(pTLData, wszInterface); + AddToTLDataStrW(pTLData, wszName); + AddToTLDataStrW(pTLData, wszSpace); + if(cImplTypes) + { + AddToTLDataStrW(pTLData, wszColon); + AddToTLDataStrW(pTLData, wszSpace); + + ITypeInfo_GetRefTypeOfImplType(pTypeInfo, 0, &hRefType); + ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo); + ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, + NULL, NULL, NULL); + AddToTLDataStrW(pTLData, bstrName); + AddToTLDataStrW(pTLData, wszSpace); + + SysFreeString(bstrName); + ITypeInfo_Release(pRefTypeInfo); + } + AddToTLDataStrW(pTLData, wszOpenBrackets3); + AddToTLDataStrW(pTLData, wszNewLine); + + AddToStrW(pTLData->wszInsertAfter, wszCloseBrackets3); + AddToStrW(pTLData->wszInsertAfter, wszSemicolon); + AddToStrW(pTLData->wszInsertAfter, wszNewLine); +} + int PopulateTree(void) { TVINSERTSTRUCT tvis; @@ -389,6 +511,7 @@ int PopulateTree(void) AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszOpenBrackets3); AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, wszCloseBrackets3); AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, wszSemicolon); @@ -402,7 +525,8 @@ int PopulateTree(void) { ITypeLib_GetTypeInfo(pTypeLib, i, &pTypeInfo); - ITypeInfo_GetDocumentation(pTypeInfo, MEMBERID_NIL, &bstrName, NULL, NULL, NULL); + ITypeInfo_GetDocumentation(pTypeInfo, MEMBERID_NIL, &bstrName, &bstrData, + NULL, NULL); ITypeInfo_GetTypeAttr(pTypeInfo, &pTypeAttr); memset(wszText, 0, sizeof(wszText)); @@ -421,6 +545,7 @@ int PopulateTree(void) AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszSpace); AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszOpenBrackets3); AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, wszCloseBrackets3); AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, @@ -431,6 +556,7 @@ int PopulateTree(void) wszSemicolon); AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, wszNewLine); + AddToStrW(wszText, wszTKIND_RECORD); AddToStrW(wszText, bstrName); break; @@ -439,6 +565,9 @@ int PopulateTree(void) AddToStrW(wszText, bstrName); break; case TKIND_INTERFACE: + CreateInterfaceInfo(pTypeInfo, pTypeAttr->cImplTypes, bstrName, + bstrData, pTypeAttr, (TYPELIB_DATA*)(U(tvis).item.lParam)); + AddToStrW(wszText, wszTKIND_INTERFACE); AddToStrW(wszText, bstrName); break; @@ -462,7 +591,11 @@ int PopulateTree(void) ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo); ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, - NULL, NULL, NULL); + &bstrData, NULL, NULL); + + CreateInterfaceInfo(pTypeInfo, pTypeAttr->cImplTypes, bstrName, + bstrData, pTypeAttr, (TYPELIB_DATA*)(U(tvis).item.lParam)); + AddToStrW(wszText, wszTKIND_INTERFACE); AddToStrW(wszText, bstrName); ITypeInfo_Release(pRefTypeInfo); @@ -491,6 +624,7 @@ int PopulateTree(void) ITypeInfo_ReleaseTypeAttr(pTypeInfo, pTypeAttr); ITypeInfo_Release(pTypeInfo); SysFreeString(bstrName); + SysFreeString(bstrData); } SendMessage(typelib.hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)tvis.hParent);

1 0

Andrew Talbot : riched20: Write-strings warnings fix.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 0c96a42a594ff52b2be678ad87b7e517c20536e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c96a42a594ff52b2be678a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jul 21 21:05:00 2006 +0100 riched20: Write-strings warnings fix. The string members of the FINDTEXT and FINDTEXTEX structs are declared constant in the SDK. --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/tests/editor.c | 4 ++-- include/richedit.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index eaab0f7..0bdfcd6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -769,7 +769,7 @@ ME_FindItemAtOffset(ME_TextEditor *edito static int -ME_FindText(ME_TextEditor *editor, DWORD flags, CHARRANGE *chrg, WCHAR *text, CHARRANGE *chrgText) +ME_FindText(ME_TextEditor *editor, DWORD flags, CHARRANGE *chrg, const WCHAR *text, CHARRANGE *chrgText) { const int nLen = lstrlenW(text); const int nTextLen = ME_GetTextLength(editor); @@ -2675,7 +2675,7 @@ LRESULT WINAPI REExtendedRegisterClass(v int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) { struct prefix_s { - char *text; + const char *text; int length; } prefixes[12] = { {"http:", 5}, diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c71ca7f..7aa5a5f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -44,7 +44,7 @@ static const char haystack[] = "WINEWine struct find_s { int start; int end; - char *needle; + const char *needle; int flags; int expected_loc; int _todo_wine; @@ -565,7 +565,7 @@ static HWND new_static_wnd(HWND parent) static void test_EM_AUTOURLDETECT(void) { struct urls_s { - char *text; + const char *text; int is_url; } urls[12] = { {"winehq.org", 0}, diff --git a/include/richedit.h b/include/richedit.h index 9798fc6..ffbf661 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -434,25 +434,25 @@ typedef struct _ensaveclipboard { typedef struct _findtextA { CHARRANGE chrg; - LPSTR lpstrText; + LPCSTR lpstrText; } FINDTEXTA; typedef struct _findtextW { CHARRANGE chrg; - LPWSTR lpstrText; + LPCWSTR lpstrText; } FINDTEXTW; DECL_WINELIB_TYPE_AW(FINDTEXT) typedef struct _findtextexA { CHARRANGE chrg; - LPSTR lpstrText; + LPCSTR lpstrText; CHARRANGE chrgText; } FINDTEXTEXA; typedef struct _findtextexW { CHARRANGE chrg; - LPWSTR lpstrText; + LPCWSTR lpstrText; CHARRANGE chrgText; } FINDTEXTEXW;

1 0

Andrew Talbot : shell32/tests: Write-strings warnings fix.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: bbd8008b55c1d642e68bbfc076e2923458ad77fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbd8008b55c1d642e68bbfc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 22 19:15:00 2006 +0100 shell32/tests: Write-strings warnings fix. --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 815125f..dc6c201 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -475,8 +475,8 @@ static const char* testfiles[]= typedef struct { - char* verb; - char* basename; + const char* verb; + const char* basename; int rc; int todo; } filename_tests_t;

1 0

appdb/ ./scripts.js include/html.php include/t ...
by WineHQ 21 Jul '06

21 Jul '06

ChangeSet ID: 26739 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/21 14:18:10 Modified files: . : scripts.js include : html.php testData.php util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a subtle highlight when mouse is over top X rows to provide better feedback to users that they may click anywhere in the row to visit the application version. Add underlining to the text in the test results table to provide similar feedback. Patch: http://cvs.winehq.org/patch.py?id=26739 Old revision New revision Changes Path 1.4 1.5 +5 -2 appdb/scripts.js 1.9 1.10 +4 -3 appdb/include/html.php 1.6 1.7 +1 -1 appdb/include/testData.php 1.73 1.74 +1 -1 appdb/include/util.php Index: appdb/scripts.js diff -u -p appdb/scripts.js:1.4 appdb/scripts.js:1.5 --- appdb/scripts.js:1.4 21 Jul 2006 19:18:10 -0000 +++ appdb/scripts.js 21 Jul 2006 19:18:10 -0000 @@ -19,17 +19,20 @@ function deleteURL(text, url) { } } -function ChangeTrColor(tableRow, bHighLight, sHighlightColor, sInactiveColor) +function ChangeTr(tableRow, bRowActive, sHighlightColor, sInactiveColor, + sTextDecorationHighlight, sTextDecorationInactive) { - if (bHighLight) + if (bRowActive) { tableRow.style.backgroundColor = sHighlightColor; tableRow.style.cursor = "hand"; + tableRow.style.textDecoration = sTextDecorationHighlight; } else { tableRow.style.backgroundColor = sInactiveColor; tableRow.style.cursor = "pointer"; + tableRow.style.textDecoration = sTextDecorationInactive; } } Index: appdb/include/html.php diff -u -p appdb/include/html.php:1.9 appdb/include/html.php:1.10 --- appdb/include/html.php:1.9 21 Jul 2006 19:18:10 -0000 +++ appdb/include/html.php 21 Jul 2006 19:18:10 -0000 @@ -62,11 +62,12 @@ function html_tr($arr, $class = "", $ext return do_html_tr("td", $arr, $class, $extra); } -function html_tr_highlight_clickable($sClass, $sHighlightColor, $sInactiveColor, $sUrl) +function html_tr_highlight_clickable($sUrl, $sClass, $sHighlightColor, $sInactiveColor, + $sTextDecorationHighlight = "none", $sTextDecorationInactive = "none") { echo '<tr class='.$sClass.' '. - 'onmouseover="ChangeTrColor(this, true, \''.$sHighlightColor.'\', \''.$sInactiveColor.'\');"'. - 'onmouseout="ChangeTrColor(this, false, \''.$sHighlightColor.'\', \''.$sInactiveColor.'\');"'. + 'onmouseover="ChangeTr(this, true, \''.$sHighlightColor.'\', \''.$sInactiveColor.'\', \''.$sTextDecorationHighlight.'\', \''.$sTextDecorationInactive.'\');"'. + 'onmouseout="ChangeTr(this, false, \''.$sHighlightColor.'\', \''.$sInactiveColor.'\', \''.$sTextDecorationHighlight.'\', \''.$sTextDecorationInactive.'\');"'. 'onclick="DoNav(\''.$sUrl.'\');">'; } Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.6 appdb/include/testData.php:1.7 --- appdb/include/testData.php:1.6 21 Jul 2006 19:18:10 -0000 +++ appdb/include/testData.php 21 Jul 2006 19:18:10 -0000 @@ -418,7 +418,7 @@ class testData{ echo ' <td align="center" class="color2"><b>Current</b></td>',"\n"; } else /* make all non-current rows clickable so clicking on them selects the test as current */ { - html_tr_highlight_clickable($bgcolor, "", "color2", $link.$oTest->iTestingId); + html_tr_highlight_clickable($link.$oTest->iTestingId, $bgcolor, "", "color2", "underline"); echo ' <td align="center" class="color2">[<a href="'.$link.$oTest->iTestingId; if(is_string($showAll)) Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.73 appdb/include/util.php:1.74 --- appdb/include/util.php:1.73 21 Jul 2006 19:18:10 -0000 +++ appdb/include/util.php 21 Jul 2006 19:18:10 -0000 @@ -280,7 +280,7 @@ function outputTopXRow($oRow) $oVersion = new Version($oRow->versionId); $oApp = new Application($oVersion->iAppId); $img = Screenshot::get_random_screenshot_img(null, $oRow->versionId, false); // image, disable extra formatting - html_tr_highlight_clickable("white", "white", "white", 'appview.php?iVersionId='.$oRow->versionId); + html_tr_highlight_clickable('appview.php?iVersionId='.$oRow->versionId, "white", "#fffef6", "white"); echo ' <td class="app_name"> <a href="appview.php?iVersionId='.$oRow->versionId.'">'.$oApp->sName.' '.$oVersion->sName.'</a></td>

1 0

James Hawkins : msi: Set the component' s initial state based on its attributes.
by Alexandre Julliard 21 Jul '06

21 Jul '06

Module: wine Branch: refs/heads/master Commit: cae3215a6fd78446fd356cb8720dd70adc734d69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cae3215a6fd78446fd356cb… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 21 10:09:52 2006 -0700 msi: Set the component's initial state based on its attributes. --- dlls/msi/action.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d7be3b5..2479f2e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1115,8 +1115,25 @@ static MSICOMPONENT* load_component( MSI comp->KeyPath = msi_dup_record_field( row, 6 ); comp->Installed = INSTALLSTATE_ABSENT; - comp->Action = INSTALLSTATE_UNKNOWN; - comp->ActionRequest = INSTALLSTATE_UNKNOWN; + + switch (comp->Attributes) + { + case msidbComponentAttributesLocalOnly: + comp->Action = INSTALLSTATE_LOCAL; + comp->ActionRequest = INSTALLSTATE_LOCAL; + break; + case msidbComponentAttributesSourceOnly: + comp->Action = INSTALLSTATE_SOURCE; + comp->ActionRequest = INSTALLSTATE_SOURCE; + break; + case msidbComponentAttributesOptional: + comp->Action = INSTALLSTATE_LOCAL; + comp->ActionRequest = INSTALLSTATE_LOCAL; + break; + default: + comp->Action = INSTALLSTATE_UNKNOWN; + comp->ActionRequest = INSTALLSTATE_UNKNOWN; + } comp->Enabled = TRUE;

1 0