December 2010 - Wine-commits

Hans Leidekker : msi: Set the Preselected property if the default feature selection is modified in a dialog .
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: cbf7a1e86eb7dceae3295ebe7b62f70eff4672e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf7a1e86eb7dceae3295ebe7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 15:31:02 2010 +0100 msi: Set the Preselected property if the default feature selection is modified in a dialog. --- dlls/msi/events.c | 62 +++++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 96fc677..b888c1c 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -163,58 +163,50 @@ static UINT ControlEvent_DoAction(MSIPACKAGE* package, LPCWSTR argument, return ERROR_SUCCESS; } -static UINT ControlEvent_AddLocal(MSIPACKAGE* package, LPCWSTR argument, - msi_dialog* dialog) +static UINT ControlEvent_AddLocal( MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog ) { - MSIFEATURE *feature = NULL; + MSIFEATURE *feature; - if (strcmpW( szAll, argument )) + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - MSI_SetFeatureStateW(package,argument,INSTALLSTATE_LOCAL); - } - else - { - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); - - ACTION_UpdateComponentStates(package,argument); + if (!strcmpW( argument, feature->Feature ) || !strcmpW( argument, szAll )) + { + if (feature->ActionRequest != INSTALLSTATE_LOCAL) + msi_set_property( package->db, szPreselected, szOne ); + MSI_SetFeatureStateW( package, feature->Feature, INSTALLSTATE_LOCAL ); + } } return ERROR_SUCCESS; } -static UINT ControlEvent_Remove(MSIPACKAGE* package, LPCWSTR argument, - msi_dialog* dialog) +static UINT ControlEvent_Remove( MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog ) { - MSIFEATURE *feature = NULL; + MSIFEATURE *feature; - if (strcmpW( szAll, argument )) - { - MSI_SetFeatureStateW(package,argument,INSTALLSTATE_ABSENT); - } - else + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state(package, feature, INSTALLSTATE_ABSENT); - - ACTION_UpdateComponentStates(package,argument); + if (!strcmpW( argument, feature->Feature ) || !strcmpW( argument, szAll )) + { + if (feature->ActionRequest != INSTALLSTATE_ABSENT) + msi_set_property( package->db, szPreselected, szOne ); + MSI_SetFeatureStateW( package, feature->Feature, INSTALLSTATE_ABSENT ); + } } return ERROR_SUCCESS; } -static UINT ControlEvent_AddSource(MSIPACKAGE* package, LPCWSTR argument, - msi_dialog* dialog) +static UINT ControlEvent_AddSource( MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog ) { - MSIFEATURE *feature = NULL; + MSIFEATURE *feature; - if (strcmpW( szAll, argument )) + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - MSI_SetFeatureStateW(package,argument,INSTALLSTATE_SOURCE); - } - else - { - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); - ACTION_UpdateComponentStates(package,argument); + if (!strcmpW( argument, feature->Feature ) || !strcmpW( argument, szAll )) + { + if (feature->ActionRequest != INSTALLSTATE_SOURCE) + msi_set_property( package->db, szPreselected, szOne ); + MSI_SetFeatureStateW( package, feature->Feature, INSTALLSTATE_SOURCE ); + } } return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Set the install level to the maximum if the requested install state is not the default .
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 03a3292ffed984b1e5d4f367c2aa1b2c643ec554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a3292ffed984b1e5d4f367c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 15:31:26 2010 +0100 msi: Set the install level to the maximum if the requested install state is not the default. --- dlls/msi/msi.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index e66585c..266bd89 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -684,6 +684,8 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, static const WCHAR szInstalled[] = { ' ','I','n','s','t','a','l','l','e','d','=','1',0}; + static const WCHAR szInstallLevel[] = { + ' ','I','N','S','T','A','L','L','L','E','V','E','L','=','3','2','7','6','7',0}; static const WCHAR szRemoveAll[] = { ' ','R','E','M','O','V','E','=','A','L','L',0}; static const WCHAR szMachine[] = { @@ -715,6 +717,9 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (szCommandLine) sz += lstrlenW(szCommandLine); + if (eInstallState != INSTALLSTATE_DEFAULT) + sz += lstrlenW(szInstallLevel); + if (eInstallState == INSTALLSTATE_ABSENT) sz += lstrlenW(szRemoveAll); @@ -732,6 +737,9 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (szCommandLine) lstrcpyW(commandline,szCommandLine); + if (eInstallState != INSTALLSTATE_DEFAULT) + lstrcatW(commandline, szInstallLevel); + if (eInstallState == INSTALLSTATE_ABSENT) lstrcatW(commandline, szRemoveAll);

1 0

Hans Leidekker : msi: Use a function to determine if a feature is selected.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 706b54daa75330df9f52f6f57e53b3e411cc95aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=706b54daa75330df9f52f6f57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 15:31:43 2010 +0100 msi: Use a function to determine if a feature is selected. --- dlls/msi/action.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index db3eda8..c5661c0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1877,6 +1877,11 @@ static void ACTION_GetFeatureInstallStates(MSIPACKAGE *package) } } +static inline BOOL is_feature_selected( MSIFEATURE *feature, INT level ) +{ + return (feature->Level > 0 && feature->Level <= level); +} + static BOOL process_state_property(MSIPACKAGE* package, int level, LPCWSTR property, INSTALLSTATE state) { @@ -1889,8 +1894,7 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (strcmpW( property, szRemove ) && - (feature->Level <= 0 || feature->Level > level)) + if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level )) continue; if (!strcmpW(property, szReinstall)) state = feature->Installed; @@ -1981,10 +1985,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - BOOL feature_state = ((feature->Level > 0) && - (feature->Level <= level)); + if (!is_feature_selected( feature, level )) continue; - if (feature_state && feature->ActionRequest == INSTALLSTATE_UNKNOWN) + if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) { if (feature->Attributes & msidbFeatureAttributesFavorSource) msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); @@ -2000,20 +2003,19 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { FeatureList *fl; - if (feature->Level > 0 && feature->Level <= level) - continue; + if (is_feature_selected( feature, level )) continue; LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) msi_feature_set_state(package, fl->feature, INSTALLSTATE_UNKNOWN); } } - else + else /* preselected */ { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - BOOL selected = feature->Level > 0 && feature->Level <= level; + if (!is_feature_selected( feature, level )) continue; - if (selected && feature->ActionRequest == INSTALLSTATE_UNKNOWN) + if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) { msi_feature_set_state(package, feature, feature->Installed); } @@ -2031,8 +2033,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) debugstr_w(feature->Feature), feature->Level, feature->Installed, feature->ActionRequest, feature->Action); - if (!feature->Level) - continue; + if (!is_feature_selected( feature, level )) continue; /* features with components that have compressed files are made local */ LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry )

1 0

Jacek Caban : include: Added macros for unions and structs that should remain nameless regardless NONAMELESSUNION /NONAMELESSSTRUCT definition.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 45be01952a21e4f42e4e4114c11f6084090e941e URL: http://source.winehq.org/git/wine.git/?a=commit;h=45be01952a21e4f42e4e4114c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 23 16:05:29 2010 +0100 include: Added macros for unions and structs that should remain nameless regardless NONAMELESSUNION/NONAMELESSSTRUCT definition. --- Maketest.rules.in | 2 +- include/winineti.h | 16 ++++++++-------- include/winnt.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index 31404d5..5725d41 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -10,7 +10,7 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = -DWINE_STRICT_PROTOTYPES $(EXTRADEFS) +DEFS = -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION $(EXTRADEFS) MODULE = $(TESTDLL:%.dll=%)_test.exe TESTRESULTS = $(C_SRCS:.c=.ok) diff --git a/include/winineti.h b/include/winineti.h index 27efa50..4f86db6 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -46,15 +46,15 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOA BOOL fPerUser; DWORD dwSyncMode; DWORD dwNumCachePaths; - union + __C89_NAMELESSUNION union { - struct + __C89_NAMELESSSTRUCT struct { CHAR CachePath[MAX_PATH]; DWORD dwCacheSize; - } DUMMYSTRUCTNAME; + } __C89_NAMELESSSTRUCTNAME; INTERNET_CACHE_CONFIG_PATH_ENTRYA CachePaths[ANYSIZE_ARRAY]; - } DUMYUNIONNAME; + } __C89_NAMELESSUNIONNAME; DWORD dwNormalUsage; DWORD dwExemptUsage; } INTERNET_CACHE_CONFIG_INFOA, *LPINTERNET_CACHE_CONFIG_INFOA; @@ -68,15 +68,15 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOW BOOL fPerUser; DWORD dwSyncMode; DWORD dwNumCachePaths; - union + __C89_NAMELESSUNION union { - struct + __C89_NAMELESSSTRUCT struct { WCHAR CachePath[MAX_PATH]; DWORD dwCacheSize; - } DUMMYSTRUCTNAME; + } __C89_NAMELESSSTRUCTNAME; INTERNET_CACHE_CONFIG_PATH_ENTRYW CachePaths[ANYSIZE_ARRAY]; - } ; + } __C89_NAMELESSUNIONNAME; DWORD dwNormalUsage; DWORD dwExemptUsage; } INTERNET_CACHE_CONFIG_INFOW, *LPINTERNET_CACHE_CONFIG_INFOW; diff --git a/include/winnt.h b/include/winnt.h index 65dde7a..6cd97bc 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -230,6 +230,44 @@ extern "C" { #define DUMMYUNIONNAME8 u8 #endif /* !defined(NONAMELESSUNION) */ +#ifndef __C89_NAMELESSSTRUCT +# if !defined(__WINESRC__) && !defined(WINE_NO_NAMELESS_EXTENSION) +# ifdef __GNUC__ + /* Anonymous structs support starts with gcc 2.96/g++ 2.95 */ +# if (__GNUC__ > 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ > 95) || ((__GNUC_MINOR__ == 95) && defined(__cplusplus)))) +# define __C89_NAMELESSSTRUCT __extension__ +# endif +# elif defined(_MSC_VER) +# define __C89_NAMELESSSTRUCT +# endif +# endif +# ifdef __C89_NAMELESSSTRUCT +# define __C89_NAMELESSSTRUCTNAME +# else +# define __C89_NAMELESSSTRUCT +# define __C89_NAMELESSSTRUCTNAME DUMMYSTRUCTNAME +# endif +#endif + +#ifndef __C89_NAMELESSUNION +# if !defined(__WINESRC__) && !defined(WINE_NO_NAMELESS_EXTENSION) +# ifdef __GNUC__ + /* Anonymous unions support starts with gcc 2.96/g++ 2.95 */ +# if (__GNUC__ > 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ > 95) || ((__GNUC_MINOR__ == 95) && defined(__cplusplus)))) +# define __C89_NAMELESSUNION __extension__ +# endif +# elif defined(_MSC_VER) +# define __C89_NAMELESSUNION +# endif +# endif +# ifdef __C89_NAMELESSUNION +# define __C89_NAMELESSUNIONNAME +# else +# define __C89_NAMELESSUNION +# define __C89_NAMELESSUNIONNAME DUMMYUNIONNAME +# endif +#endif + /* C99 restrict support */ #if defined(ENABLE_RESTRICTED) && !defined(MIDL_PASS) && !defined(RC_INVOKED)

1 0

Luca Bennati : wininet: Update Italian translation.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 63d8852c664ea52381ff8808faf52abb09cf05da URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d8852c664ea52381ff8808f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Dec 23 11:51:18 2010 +0100 wininet: Update Italian translation. --- dlls/wininet/wininet_It.rc | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/wininet_It.rc b/dlls/wininet/wininet_It.rc index 4bf4a99..b3bc9a4 100644 --- a/dlls/wininet/wininet_It.rc +++ b/dlls/wininet/wininet_It.rc @@ -2,6 +2,7 @@ * Copyright 2003 Mike McCormack for CodeWeavers * Copyright 2003 Ivan Leo Puoti * Copyright 2006 Antonio Codazzi + * Copyright 2010 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -39,9 +40,9 @@ FONT 8, "MS Shell Dlg" LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Memorizza la password ( RISCHIOSO )", IDC_SAVEPASSWORD, + CHECKBOX "&Memorizza la password (non sicuro)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Ok", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annulla", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } @@ -59,13 +60,29 @@ FONT 8, "MS Shell Dlg" LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Memorizza la password (RISCHIOSO)", IDC_SAVEPASSWORD, + CHECKBOX "&Memorizza la password (non sicuro)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Ok", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annulla", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avviso di sicurezza" +FONT 8, "MS Shell Dlg" +{ + LTEXT "È presente un problema con il certificato per questo sito.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "Vuoi continuare comunque?", -1, 40, 46, 200, 20 + PUSHBUTTON "Sì", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { -IDS_LANCONNECTION "Connessione LAN" + IDS_LANCONNECTION "Connessione LAN" + IDS_CERT_CA_INVALID "Il certificato è stato emesso da un editore sconosciuto o non fidato." + IDS_CERT_DATE_INVALID "La data sul certificato non è valida." + IDS_CERT_CN_INVALID "Il nome sul certificato non corrisponde al sito." + IDS_CERT_ERRORS "È presente almeno un problema di sicurezza non specificato con questo certificato." }

1 0

André Hentschel : gameux: Fix another test failure on Wine wow64.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: a22b2c5686829d2f60beb4f820fccf524bfadc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22b2c5686829d2f60beb4f82… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 24 00:51:41 2010 +0100 gameux: Fix another test failure on Wine wow64. --- dlls/gameux/gamestatistics.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 5650c94..926023b 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -365,6 +365,7 @@ static HRESULT GAMEUX_getAppIdFromGDFPath( GAME_INSTALL_SCOPE installScope; GUID instanceId; LPWSTR lpRegistryPath; + HKEY hKey; DWORD dwLength = 49*sizeof(WCHAR);/* place for GUID */ TRACE("(%s, %p)\n", debugstr_w(GDFBinaryPath), lpApplicationId); @@ -390,11 +391,16 @@ static HRESULT GAMEUX_getAppIdFromGDFPath( hr = GAMEUX_buildGameRegistryPath(installScope, &instanceId, &lpRegistryPath); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, - lpRegistryPath, sApplicationId, RRF_RT_REG_SZ, + hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, + lpRegistryPath, 0, KEY_READ | KEY_WOW64_64KEY, &hKey)); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(hKey, + NULL, sApplicationId, RRF_RT_REG_SZ, NULL, lpApplicationId, &dwLength)); HeapFree(GetProcessHeap(), 0, lpRegistryPath); + RegCloseKey(hKey); TRACE("found app id: %s, return: %#x\n", debugstr_w(lpApplicationId), hr); return hr;

1 0

Nikolay Sivov : oleaut32: Fix ICreateTypeInfo2::SetVarHelpContext() to iterate properly.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 8305abdab7b9ed6aa193a85ba69a39a12685b7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8305abdab7b9ed6aa193a85ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 24 02:04:38 2010 +0300 oleaut32: Fix ICreateTypeInfo2::SetVarHelpContext() to iterate properly. --- dlls/oleaut32/tests/typelib.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 2 +- 2 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index aab340e..4b91a6a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2874,6 +2874,55 @@ static void test_LoadTypeLib(void) ok(hres == TYPE_E_CANTLOADLIBRARY, "LoadTypeLib returned: %08x, expected TYPE_E_CANTLOADLIBRARY\n", hres); } +static void test_SetVarHelpContext(void) +{ + static OLECHAR nameW[] = {'n','a','m','e',0}; + CHAR filenameA[MAX_PATH]; + WCHAR filenameW[MAX_PATH]; + ICreateTypeLib2 *ctl; + ICreateTypeInfo *cti; + VARDESC desc; + HRESULT hr; + VARIANT v; + + GetTempFileNameA(".", "tlb", 0, filenameA); + MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filenameW, MAX_PATH); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &ctl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl, nameW, TKIND_ENUM, &cti); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVarHelpContext(cti, 0, 0); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.elemdescVar.tdesc.vt = VT_INT; + desc.varkind = VAR_CONST; + + V_VT(&v) = VT_INT; + V_INT(&v) = 1; + U(desc).lpvarValue = &v; + hr = ICreateTypeInfo2_AddVarDesc(cti, 0, &desc); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo2_SetVarHelpContext(cti, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + + /* another time */ + hr = ICreateTypeInfo2_SetVarHelpContext(cti, 0, 1); + ok(hr == S_OK, "got %08x\n", hr); + + /* wrong index now */ + hr = ICreateTypeInfo2_SetVarHelpContext(cti, 1, 0); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); + + ICreateTypeInfo_Release(cti); + ICreateTypeLib2_Release(ctl); + DeleteFileA(filenameA); +} + START_TEST(typelib) { const char *filename; @@ -2890,6 +2939,7 @@ START_TEST(typelib) test_QueryPathOfRegTypeLib(64); test_inheritance(); test_CreateTypeLib(); + test_SetVarHelpContext(); if ((filename = create_test_typelib(2))) { diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8fc8a92..38ef545 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2553,7 +2553,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext( if ((This->typeinfo->cElement >> 16) <= index) return TYPE_E_ELEMENTNOTFOUND; - for (iter = This->typedata->next->next; iter != This->typedata; iter = iter->next) + for (iter = This->typedata->next->next; iter != This->typedata->next; iter = iter->next) if (iter->type == CyclicListVar) { if (index-- == 0)

1 0

Nikolay Sivov : oleaut32: Hide variables and functions count storage details in helpers.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 60001e1c67732989348942dbf87a6de3bc8c0308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60001e1c67732989348942dbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 24 02:51:04 2010 +0300 oleaut32: Hide variables and functions count storage details in helpers. --- dlls/oleaut32/tests/typelib.c | 6 +++ dlls/oleaut32/typelib2.c | 68 ++++++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 4b91a6a..2eb1147 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1548,6 +1548,12 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_SetFuncHelpContext(createti, 1, 0xabcdefab); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, propname, 0); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, NULL, 1); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, propname, 1); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 38ef545..9b3015b 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -230,6 +230,16 @@ static CyclicList *alloc_cyclic_list_item(CyclicListElementType type) /*================== Internal functions ===================================*/ +static inline UINT cti2_get_var_count(const MSFT_TypeInfoBase *typeinfo) +{ + return typeinfo->cElement >> 16; +} + +static inline UINT cti2_get_func_count(const MSFT_TypeInfoBase *typeinfo) +{ + return typeinfo->cElement & 0xFFFF; +} + /**************************************************************************** * ctl2_init_header * @@ -1921,7 +1931,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( return TYPE_E_BADMODULEKIND; } - if(This->typeinfo->cElement<index) + if(cti2_get_func_count(This->typeinfo) < index) return TYPE_E_ELEMENTNOTFOUND; if((pFuncDesc->invkind&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && @@ -2006,7 +2016,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( insert->name = -1; /* insert type data to list */ - if(index == This->typeinfo->cElement) { + if(index == cti2_get_func_count(This->typeinfo)) { insert->next = This->typedata->next; This->typedata->next = insert; This->typedata = insert; @@ -2212,10 +2222,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( pVarDesc->elemdescVar.u.paramdesc.pparamdescex, pVarDesc->elemdescVar.u.paramdesc.wParamFlags, pVarDesc->wVarFlags, pVarDesc->varkind); - if ((This->typeinfo->cElement >> 16) != index) { - TRACE("Out-of-order element.\n"); + if (cti2_get_var_count(This->typeinfo) != index) return TYPE_E_ELEMENTNOTFOUND; - } if (!This->typedata) { This->typedata = alloc_cyclic_list_item(CyclicListSentinel); @@ -2318,20 +2326,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( ICreateTypeInfo2* iface, UINT index, - LPOLESTR* rgszNames, + LPOLESTR* names, UINT cNames) { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; - CyclicList *iter = NULL, *iter2; - int offset, len, i=0; + CyclicList *iter, *iter2; + int offset, len, i; char *namedata; - TRACE("(%p %d %p %d)\n", iface, index, rgszNames, cNames); + TRACE("(%p %d %p %d)\n", This, index, names, cNames); - if(!rgszNames) + if(!names) return E_INVALIDARG; - if(index >= (This->typeinfo->cElement&0xFFFF) || !cNames) + if(index >= cti2_get_func_count(This->typeinfo) || cNames == 0) return TYPE_E_ELEMENTNOTFOUND; for(iter=This->typedata->next->next, i=0; /* empty */; iter=iter->next) @@ -2343,7 +2351,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( if(cNames != iter->u.data[5] + ((iter->u.data[4]>>3)&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF) ? 0 : 1)) return TYPE_E_ELEMENTNOTFOUND; - len = ctl2_encode_name(This->typelib, rgszNames[0], &namedata); + len = ctl2_encode_name(This->typelib, names[0], &namedata); for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { if(iter2->name!=-1 && !memcmp(namedata, This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len)) { @@ -2360,7 +2368,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( } } - offset = ctl2_alloc_name(This->typelib, rgszNames[0]); + offset = ctl2_alloc_name(This->typelib, names[0]); if(offset == -1) return E_OUTOFMEMORY; @@ -2373,7 +2381,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( len = (iter->u.data[0]&0xFFFF)/4 - iter->u.data[5]*3; for (i = 1; i < cNames; i++) { - offset = ctl2_alloc_name(This->typelib, rgszNames[i]); + offset = ctl2_alloc_name(This->typelib, names[i]); iter->u.data[len + ((i-1)*3) + 1] = offset; } @@ -2395,12 +2403,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName( int offset, i; char *namedata; - TRACE("(%p,%d,%s), stub!\n", iface, index, debugstr_w(szName)); + TRACE("(%p,%d,%s)\n", This, index, debugstr_w(szName)); - if ((This->typeinfo->cElement >> 16) <= index) { - TRACE("Out-of-order element.\n"); + if (cti2_get_var_count(This->typeinfo) <= index) return TYPE_E_ELEMENTNOTFOUND; - } offset = ctl2_alloc_name(This->typelib, szName); if (offset == -1) return E_OUTOFMEMORY; @@ -2516,10 +2522,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext( TRACE("(%p,%d,%d)\n", iface, index, dwHelpContext); - if(This->typeinfo->cElement<index) + if(cti2_get_func_count(This->typeinfo) < index) return TYPE_E_ELEMENTNOTFOUND; - if(This->typeinfo->cElement == index && This->typedata->type == CyclicListFunc) + if(cti2_get_func_count(This->typeinfo) == index && This->typedata->type == CyclicListFunc) func = This->typedata; else for(func=This->typedata->next->next; func!=This->typedata; func=func->next) @@ -2550,7 +2556,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext( TRACE("(%p,%d,%d)\n", This, index, context); - if ((This->typeinfo->cElement >> 16) <= index) + if (cti2_get_var_count(This->typeinfo) <= index) return TYPE_E_ELEMENTNOTFOUND; for (iter = This->typedata->next->next; iter != This->typedata->next; iter = iter->next) @@ -2711,7 +2717,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( if(!This->typedata) return S_OK; - typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList*)*(This->typeinfo->cElement&0xffff)); + typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList*)*cti2_get_func_count(This->typeinfo)); if(!typedata) return E_OUTOFMEMORY; @@ -2793,7 +2799,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( if(user_vft) This->typeinfo->cbSizeVft = user_vft+3; - for(i=0; i<(This->typeinfo->cElement&0xffff); i++) { + for(i=0; i< cti2_get_func_count(This->typeinfo); i++) { if(typedata[i]->u.data[4]>>16 > i) { int inv; @@ -2962,7 +2968,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncCustData( TRACE("(%p,%d,%s,%p)\n", iface, index, debugstr_guid(guid), pVarVal); - if(index >= (This->typeinfo->cElement&0xFFFF)) + if(index >= cti2_get_func_count(This->typeinfo)) return TYPE_E_ELEMENTNOTFOUND; for(iter=This->typedata->next->next; /* empty */; iter=iter->next) @@ -3198,16 +3204,16 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeAttr( (*ppTypeAttr)->lcid = This->typelib->typelib_header.lcid; (*ppTypeAttr)->cbSizeInstance = This->typeinfo->size; (*ppTypeAttr)->typekind = This->typekind; - (*ppTypeAttr)->cFuncs = This->typeinfo->cElement&0xffff; + (*ppTypeAttr)->cFuncs = cti2_get_func_count(This->typeinfo); if(This->typeinfo->flags&TYPEFLAG_FDUAL && This->typekind==TKIND_DISPATCH) (*ppTypeAttr)->cFuncs += 7; - (*ppTypeAttr)->cVars = This->typeinfo->cElement>>16; + (*ppTypeAttr)->cVars = cti2_get_var_count(This->typeinfo); (*ppTypeAttr)->cImplTypes = This->typeinfo->cImplTypes; (*ppTypeAttr)->cbSizeVft = This->typekind==TKIND_DISPATCH ? 7 * sizeof(void*) : This->typeinfo->cbSizeVft; (*ppTypeAttr)->cbAlignment = (This->typeinfo->typekind>>11) & 0x1f; (*ppTypeAttr)->wTypeFlags = This->typeinfo->flags; - (*ppTypeAttr)->wMajorVerNum = This->typeinfo->version&0xffff; - (*ppTypeAttr)->wMinorVerNum = This->typeinfo->version>>16; + (*ppTypeAttr)->wMajorVerNum = LOWORD(This->typeinfo->version); + (*ppTypeAttr)->wMinorVerNum = HIWORD(This->typeinfo->version); if((*ppTypeAttr)->typekind == TKIND_ALIAS) FIXME("TKIND_ALIAS handling not implemented\n"); @@ -3248,7 +3254,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncDesc( if (!ppFuncDesc) return E_INVALIDARG; - if (index >= This->typeinfo->cElement) + if (index >= cti2_get_func_count(This->typeinfo)) return TYPE_E_ELEMENTNOTFOUND; hres = ICreateTypeInfo2_LayOut((ICreateTypeInfo2*)This); @@ -4599,8 +4605,8 @@ static HRESULT ctl2_finalize_typeinfos(ICreateTypeLib2Impl *This, int filesize) if (typeinfo->typedata) filesize += typeinfo->typedata->next->u.val - + ((typeinfo->typeinfo->cElement >> 16) * 12) - + ((typeinfo->typeinfo->cElement & 0xffff) * 12) + 4; + + cti2_get_var_count(typeinfo->typeinfo) * 12 + + cti2_get_func_count(typeinfo->typeinfo) * 12 + 4; } return S_OK;

1 0

Hans Leidekker : uninstaller: Fix a leak.
by Alexandre Julliard 24 Dec '10

24 Dec '10

Module: wine Branch: master Commit: 458fcf4aa7df0cc8526cee5d1274e4e8310c73b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458fcf4aa7df0cc8526cee5d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 09:37:51 2010 +0100 uninstaller: Fix a leak. --- programs/uninstaller/main.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index f781d3c..5d74ea8 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -209,8 +209,12 @@ static int FetchFromRootKey(HKEY root) command = HeapAlloc(GetProcessHeap(), 0, uninstlen); RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen); } - else continue; - + else + { + RegCloseKey(hkeyApp); + sizeOfSubKeyName = 255; + continue; + } numentries++; entries = HeapReAlloc(GetProcessHeap(), 0, entries, numentries*sizeof(uninst_entry)); entries[numentries-1].root = root;

1 0

Hans Leidekker : msi: Remove an incorrect error trace.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 05a95f2e9224e242efcf6bc2b07f23f7cce342f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a95f2e9224e242efcf6bc2b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 23 17:09:06 2010 +0100 msi: Remove an incorrect error trace. --- dlls/msi/package.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c81ddad..c7e1f98 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -59,8 +59,7 @@ static void remove_tracked_tempfiles( MSIPACKAGE *package ) list_remove( &temp->entry ); TRACE("deleting temp file %s\n", debugstr_w( temp->Path )); - if (!DeleteFileW( temp->Path )) - ERR("failed to delete %s\n", debugstr_w( temp->Path )); + DeleteFileW( temp->Path ); msi_free( temp->Path ); msi_free( temp ); }

1 0