wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Andrew Nguyen : mmsystem.dll16: Correctly map the MCI_SYSINFO_PARMS structure when MCI_SYSINFO_QUANTITY is set .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: ebd82af1ff0c2bfc78824ab0fbae8779d41077f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd82af1ff0c2bfc78824ab0f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jan 4 02:15:06 2011 -0600 mmsystem.dll16: Correctly map the MCI_SYSINFO_PARMS structure when MCI_SYSINFO_QUANTITY is set. (cherry picked from commit b84f2f229b08acab6622e691a5f1dbcaefa8232f) --- dlls/mmsystem.dll16/mci16.c | 59 +++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 914636d..531c523 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -268,23 +268,30 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l } return MMSYSTEM_MAP_OKMEM; case MCI_SYSINFO: - { - LPMCI_SYSINFO_PARMSW msip32w = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMCI_OPEN_PARMS16) + sizeof(MCI_SYSINFO_PARMSW)); - LPMCI_SYSINFO_PARMS16 msip16 = MapSL(*lParam); - - if (msip32w) { - *(LPMCI_SYSINFO_PARMS16*)(msip32w) = msip16; - msip32w = (LPMCI_SYSINFO_PARMSW)((char*)msip32w + sizeof(LPMCI_OPEN_PARMS16)); - msip32w->dwCallback = msip16->dwCallback; - msip32w->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, msip16->dwRetSize * sizeof(WCHAR)); - msip32w->dwRetSize = msip16->dwRetSize; - msip32w->dwNumber = msip16->dwNumber; - msip32w->wDeviceType = msip16->wDeviceType; - } else { - return MMSYSTEM_MAP_NOMEM; - } - *lParam = (DWORD)msip32w; - } + { + MCI_SYSINFO_PARMSW *msip32w = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_OPEN_PARMS16 *) + sizeof(MCI_SYSINFO_PARMSW)); + MCI_SYSINFO_PARMS16 *msip16 = MapSL(*lParam); + + if (!msip32w) + return MMSYSTEM_MAP_NOMEM; + + *(MCI_SYSINFO_PARMS16 **)msip32w = msip16; + msip32w = (MCI_SYSINFO_PARMSW *)((char *)msip32w + sizeof(MCI_OPEN_PARMS16 *)); + msip32w->dwCallback = msip16->dwCallback; + msip32w->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, (dwFlags & MCI_SYSINFO_QUANTITY) ? + sizeof(DWORD) : + msip16->dwRetSize * sizeof(WCHAR)); + if (!msip32w->lpstrReturn) + { + HeapFree(GetProcessHeap(), 0, msip32w); + return MMSYSTEM_MAP_NOMEM; + } + msip32w->dwRetSize = (dwFlags & MCI_SYSINFO_QUANTITY) ? sizeof(DWORD) : msip16->dwRetSize; + msip32w->dwNumber = msip16->dwNumber; + msip32w->wDeviceType = msip16->wDeviceType; + + *lParam = (DWORD)msip32w; + } return MMSYSTEM_MAP_OKMEM; case MCI_SOUND: { @@ -390,13 +397,21 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR return MMSYSTEM_MAP_OK; case MCI_SYSINFO: if (lParam) { - LPMCI_SYSINFO_PARMSW msip32w = (LPMCI_SYSINFO_PARMSW)lParam; - LPMCI_SYSINFO_PARMS16 msip16 = *(LPMCI_SYSINFO_PARMS16*)((char*)msip32w - sizeof(LPMCI_SYSINFO_PARMS16)); + MCI_SYSINFO_PARMSW *msip32w = (MCI_SYSINFO_PARMSW *)lParam; + MCI_SYSINFO_PARMS16 *msip16 = *(MCI_SYSINFO_PARMS16 **)((char *)msip32w - sizeof(MCI_SYSINFO_PARMS16 *)); + + if (dwFlags & MCI_SYSINFO_QUANTITY) { + DWORD *quantity = MapSL(msip16->lpstrReturn); + + *quantity = *(DWORD *)msip32w->lpstrReturn; + } + else { + WideCharToMultiByte(CP_ACP, 0, + msip32w->lpstrReturn, msip32w->dwRetSize, + MapSL(msip16->lpstrReturn), msip16->dwRetSize, + NULL, NULL); + } - WideCharToMultiByte(CP_ACP, 0, - msip32w->lpstrReturn, msip32w->dwRetSize, - MapSL(msip16->lpstrReturn), msip16->dwRetSize, - NULL, NULL); HeapFree(GetProcessHeap(), 0, msip32w->lpstrReturn); HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); }

1 0

Piotr Caban : shell32: Improved equal ITEMIDLISTs handling in ILIsParent.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 7f3953d4b8b567d36d8dfaf222171ba17f2b0829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3953d4b8b567d36d8dfaf22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 6 00:01:28 2011 +0100 shell32: Improved equal ITEMIDLISTs handling in ILIsParent. (cherry picked from commit 92ba2168fa2b46a077f3d7746ce70ad6e815a7b2) --- dlls/shell32/pidl.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index dffa2bd..f1f89a2 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -544,6 +544,8 @@ BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) * parent = a/b, child = a/b/c -> true, c is in folder a/b * child = a/b/c/d -> false if bImmediate is true, d is not in folder a/b * child = a/b/c/d -> true if bImmediate is false, d is in a subfolder of a/b + * child = a/b -> false if bImmediate is true + * child = a/b -> true if bImmediate is false */ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL bImmediate) { @@ -569,12 +571,12 @@ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL b pChild = ILGetNext(pChild); } - /* child shorter or has equal length to parent */ - if (pParent->mkid.cb || !pChild->mkid.cb) + /* child has shorter name than parent */ + if (pParent->mkid.cb) return FALSE; /* not immediate descent */ - if ( ILGetNext(pChild)->mkid.cb && bImmediate) + if ((!pChild->mkid.cb || ILGetNext(pChild)->mkid.cb) && bImmediate) return FALSE; return TRUE;

1 0

Huw Davies : wineps.drv: Explicitly report that we do not support blending.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: d81734c4609976196b76413eaf60c7d72001707e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81734c4609976196b76413ea… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 11:40:28 2011 +0000 wineps.drv: Explicitly report that we do not support blending. (cherry picked from commit 40ba10ed7ae8f17e8bb0ea89ae86437f7d0f3a00) --- dlls/wineps.drv/init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 685a56a..d83c304 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -510,6 +510,8 @@ INT CDECL PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) case VREFRESH: case BLTALIGNMENT: return 0; + case SHADEBLENDCAPS: + return SB_NONE; default: FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap ); return 0;

1 0

Nikolay Sivov : oleview: Fix some crashes on unnamed methods/arguments.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 3f5359e10a2e1606e4182ccf491893d2d36f604e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5359e10a2e1606e4182ccf4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 2 16:05:10 2011 +0300 oleview: Fix some crashes on unnamed methods/arguments. (cherry picked from commit f88d7bc8ca2e67d4b04870dc6295aaf04661c4b5) --- programs/oleview/typelib.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 771305f..d2d6d00 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -631,7 +631,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszStdCall); AddToTLDataStrW(tld, wszSpace); } - AddToTLDataStrW(tld, bstrName); + if (bstrName) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszOpenBrackets2); for(j=0; j<pFuncDesc->cParams; j++) @@ -701,8 +701,11 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszAfter); AddToTLDataStrW(tld, wszSpace); if (j+1 < namesNo) { - AddToTLDataStrW(tld, bstrParamNames[j+1]); - SysFreeString(bstrParamNames[j+1]); + if (bstrParamNames[j+1]) + { + AddToTLDataStrW(tld, bstrParamNames[j+1]); + SysFreeString(bstrParamNames[j+1]); + } } else { AddToTLDataStrW(tld, szRhs); }

1 0

Nikolay Sivov : oleview: Fix some crashes on unnamed variables.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: facf7c5523373cd83dc4632b2db8427119e7d9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=facf7c5523373cd83dc4632b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 31 23:36:08 2010 +0300 oleview: Fix some crashes on unnamed variables. (cherry picked from commit 64bf7ca869cd6615bf6ecc9eafd9a165938031c4) --- programs/oleview/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 2b69ec4..771305f 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -420,7 +420,7 @@ static int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) memset(wszAfter, 0, sizeof(wszAfter)); CreateTypeInfo(wszText, wszAfter, pVarDesc->elemdescVar.tdesc, pTypeInfo); AddToStrW(wszText, wszSpace); - AddToStrW(wszText, bstrName); + if (bstrName) AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); AddToTLDataStrW(tld, wszText); AddToTLDataStrW(tld, wszSemicolon); @@ -482,7 +482,7 @@ static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) AddToStrW(wszText, wszSpace); AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); - AddToTLDataStrW(tld, bstrName); + if (bstrName) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszAfter); if (i<cVars-1) AddToTLDataStrW(tld, wszComa);

1 0

Nikolay Sivov : oleview: Fix a crash on null helpstring and name on library level.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: eab43474944319f04c7cdc4bf5b35abd0ddbe4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab43474944319f04c7cdc4bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 31 15:46:50 2010 +0300 oleview: Fix a crash on null helpstring and name on library level. (cherry picked from commit cd028045f18e2314540c9e4add0d4b0d54bc9157) --- programs/oleview/typelib.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 7be31c9..2b69ec4 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1227,20 +1227,26 @@ static int PopulateTree(void) AddSpaces(tld, TAB_SIZE); wsprintfW(wszText, wszFormat2, pTLibAttr->wMajorVerNum, pTLibAttr->wMinorVerNum); AddToTLDataStrW(tld, wszText); - AddToTLDataStrW(tld, wszComa); - AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, TAB_SIZE); - AddToTLDataStrW(tld, wszHelpstring); - AddToTLDataStrW(tld, wszOpenBrackets2); - AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, bstrData); - AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, wszCloseBrackets2); + + if (bstrData) + { + /* helpstring is optional */ + AddToTLDataStrW(tld, wszComa); + AddToTLDataStrW(tld, wszNewLine); + AddSpaces(tld, TAB_SIZE); + AddToTLDataStrW(tld, wszHelpstring); + AddToTLDataStrW(tld, wszOpenBrackets2); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, bstrData); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, wszCloseBrackets2); + } + AddToTLDataStrW(tld, wszNewLine); AddToTLDataStrW(tld, wszCloseBrackets1); AddToTLDataStrW(tld, wszNewLine); AddToTLDataStrW(tld, wszLibrary); - AddToTLDataStrW(tld, bstrName); + if (bstrName) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszNewLine); AddToTLDataStrW(tld, wszOpenBrackets3); AddToTLDataStrW(tld, wszNewLine);

1 0

Andrew Nguyen : wineboot: Set a placeholder ProcessorNameString value in the volatile CPU registry keys .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 977ec842b1504319e6d1d22448be3b612e6beb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=977ec842b1504319e6d1d2244… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:54:24 2010 -0600 wineboot: Set a placeholder ProcessorNameString value in the volatile CPU registry keys. (cherry picked from commit 1bffb577e33155bb153ee35886349029e35173d3) --- programs/wineboot/wineboot.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 3c873ee..86f3f72 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -175,6 +175,7 @@ static void create_hardware_registry_keys(void) static const WCHAR cpuW[] = {'C','e','n','t','r','a','l','P','r','o','c','e','s','s','o','r',0}; static const WCHAR FeatureSetW[] = {'F','e','a','t','u','r','e','S','e','t',0}; static const WCHAR IdentifierW[] = {'I','d','e','n','t','i','f','i','e','r',0}; + static const WCHAR ProcessorNameStringW[] = {'P','r','o','c','e','s','s','o','r','N','a','m','e','S','t','r','i','n','g',0}; static const WCHAR SysidW[] = {'A','T',' ','c','o','m','p','a','t','i','b','l','e',0}; static const WCHAR mhzKeyW[] = {'~','M','H','z',0}; static const WCHAR VendorIdentifierW[] = {'V','e','n','d','o','r','I','d','e','n','t','i','f','i','e','r',0}; @@ -183,6 +184,8 @@ static void create_hardware_registry_keys(void) static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',0}; + static const WCHAR IntelCpuStringW[] = {'I','n','t','e','l','(','R',')',' ','P','e','n','t','i','u','m','(','R',')',' ','4',' ', + 'C','P','U',' ','2','.','4','0','G','H','z',0}; unsigned int i; HKEY hkey, system_key, cpu_key, fpu_key; SYSTEM_CPU_INFORMATION sci; @@ -220,6 +223,7 @@ static void create_hardware_registry_keys(void) RegSetValueExW( hkey, FeatureSetW, 0, REG_DWORD, (BYTE *)&sci.FeatureSet, sizeof(DWORD) ); set_reg_value( hkey, IdentifierW, idW ); /*TODO; report amd's properly*/ + set_reg_value( hkey, ProcessorNameStringW, IntelCpuStringW ); set_reg_value( hkey, VendorIdentifierW, VenidIntelW ); RegSetValueExW( hkey, mhzKeyW, 0, REG_DWORD, (BYTE *)&power_info.MaxMhz, sizeof(DWORD) ); RegCloseKey( hkey );

1 0

Andrew Nguyen : wineboot: Set the FeatureSet value in the volatile CPU registry keys.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 364701af0123c4482ebc4ba8ba0e32dfbe62b930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=364701af0123c4482ebc4ba8b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:54:14 2010 -0600 wineboot: Set the FeatureSet value in the volatile CPU registry keys. (cherry picked from commit 0c8820563c8df325c6ab8c54fbbbdcb49491bf7b) --- programs/wineboot/wineboot.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b69ceed..3c873ee 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -173,6 +173,7 @@ static void create_hardware_registry_keys(void) 'S','y','s','t','e','m',0}; static const WCHAR fpuW[] = {'F','l','o','a','t','i','n','g','P','o','i','n','t','P','r','o','c','e','s','s','o','r',0}; static const WCHAR cpuW[] = {'C','e','n','t','r','a','l','P','r','o','c','e','s','s','o','r',0}; + static const WCHAR FeatureSetW[] = {'F','e','a','t','u','r','e','S','e','t',0}; static const WCHAR IdentifierW[] = {'I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR SysidW[] = {'A','T',' ','c','o','m','p','a','t','i','b','l','e',0}; static const WCHAR mhzKeyW[] = {'~','M','H','z',0}; @@ -216,6 +217,7 @@ static void create_hardware_registry_keys(void) if (!RegCreateKeyExW( cpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { + RegSetValueExW( hkey, FeatureSetW, 0, REG_DWORD, (BYTE *)&sci.FeatureSet, sizeof(DWORD) ); set_reg_value( hkey, IdentifierW, idW ); /*TODO; report amd's properly*/ set_reg_value( hkey, VendorIdentifierW, VenidIntelW );

1 0

Alexandre Julliard : advapi32: Fix array size construct that gcc doesn' t like.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e95d0a65a50761cfefcfb2e4652713ab429530b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95d0a65a50761cfefcfb2e46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 11:06:51 2011 +0100 advapi32: Fix array size construct that gcc doesn't like. (cherry picked from commit 5055ec63a70ff365a7719e9967e0813246bf1002) --- dlls/advapi32/registry.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index abaf09d..d5c4164 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -43,10 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA -#define NB_SPECIAL_ROOT_KEYS ((UINT_PTR)HKEY_SPECIAL_ROOT_LAST - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST + 1) - -static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; -static BOOL hkcu_cache_disabled; static const WCHAR name_CLASSES_ROOT[] = {'M','a','c','h','i','n','e','\\', @@ -67,7 +63,7 @@ static const WCHAR name_CURRENT_CONFIG[] = static const WCHAR name_DYN_DATA[] = {'D','y','n','D','a','t','a',0}; -static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = +static const WCHAR * const root_key_names[] = { name_CLASSES_ROOT, NULL, /* HKEY_CURRENT_USER is determined dynamically */ @@ -78,6 +74,11 @@ static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = name_DYN_DATA }; +#define NB_SPECIAL_ROOT_KEYS (sizeof(root_key_names)/sizeof(root_key_names[0])) + +static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; +static BOOL hkcu_cache_disabled; + static const int is_win64 = (sizeof(void *) > sizeof(int)); /* check if value type needs string conversion (Ansi<->Unicode) */

1 0

Hans Leidekker : appwiz.cpl: Run msiexec if the WindowsInstaller value is set.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: d9f045fe0ac72ed9cc72316ba36ed9c1502e5d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f045fe0ac72ed9cc72316ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 09:38:08 2010 +0100 appwiz.cpl: Run msiexec if the WindowsInstaller value is set. (cherry picked from commit 271d7b6a65f31c30211e1c074a5ed16c0140e529) --- dlls/appwiz.cpl/appwiz.c | 61 ++++++++++++++++++++++++++++++---------------- 1 files changed, 40 insertions(+), 21 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index ffd2b24..38c391c 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -97,6 +97,7 @@ static const WCHAR URLUpdateInfoW[] = {'U','R','L','U','p','d','a','t','e','I', static const WCHAR CommentsW[] = {'C','o','m','m','e','n','t','s',0}; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l', 'S','t','r','i','n','g',0}; +static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; static const WCHAR PathUninstallW[] = { 'S','o','f','t','w','a','r','e','\\', @@ -156,10 +157,10 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) HKEY hkeyUninst, hkeyApp; int i, id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; - DWORD dwNoModify, dwType; + DWORD dwNoModify, dwType, value; WCHAR subKeyName[256]; WCHAR key_app[MAX_STRING_LEN]; - WCHAR *p; + WCHAR *p, *command; APPINFO *iter = AppInfo; LPWSTR iconPtr; BOOL ret = FALSE; @@ -188,11 +189,29 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) displen = 0; uninstlen = 0; - - if ((RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen) == - ERROR_SUCCESS) && (RegQueryValueExW(hkeyApp, UninstallCommandlineW, - 0, 0, NULL, &uninstlen) == ERROR_SUCCESS)) + if (!RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen)) { + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, NULL, &value) + && dwType == REG_DWORD && value == 1) + { + static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; + int len = lstrlenW(fmtW) + lstrlenW(subKeyName); + + if (!(command = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; + wsprintfW(command, fmtW, subKeyName); + } + else if (!RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, NULL, &uninstlen)) + { + if (!(command = HeapAlloc(GetProcessHeap(), 0, uninstlen))) goto err; + RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen); + } + else + { + RegCloseKey(hkeyApp); + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + continue; + } + /* if we already have iter, allocate the next entry */ if (iter) { @@ -248,14 +267,6 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } } - iter->path = HeapAlloc(GetProcessHeap(), 0, uninstlen); - - if (!iter->path) - goto err; - - RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, - (LPBYTE)iter->path, &uninstlen); - /* publisher, version */ if (RegQueryValueExW(hkeyApp, PublisherW, 0, 0, NULL, &displen) == ERROR_SUCCESS) @@ -298,20 +309,28 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) dwNoModify = (dwNoModify == 49) ? 1 : 0; /* Fetch the modify path */ - if ((dwNoModify == 0) && (RegQueryValueExW(hkeyApp, ModifyPathW, 0, 0, NULL, &displen) - == ERROR_SUCCESS)) + if (!dwNoModify) { - iter->path_modify = HeapAlloc(GetProcessHeap(), 0, displen); - - if (!iter->path_modify) - goto err; + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, NULL, &value) + && dwType == REG_DWORD && value == 1) + { + static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','i','%','s',0}; + int len = lstrlenW(fmtW) + lstrlenW(subKeyName); - RegQueryValueExW(hkeyApp, ModifyPathW, 0, 0, (LPBYTE)iter->path_modify, &displen); + if (!(iter->path_modify = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; + wsprintfW(iter->path_modify, fmtW, subKeyName); + } + else if (!RegQueryValueExW(hkeyApp, ModifyPathW, 0, 0, NULL, &displen)) + { + if (!(iter->path_modify = HeapAlloc(GetProcessHeap(), 0, displen))) goto err; + RegQueryValueExW(hkeyApp, ModifyPathW, 0, 0, (LPBYTE)iter->path_modify, &displen); + } } /* registry key */ iter->regroot = root; lstrcpyW(iter->regkey, subKeyName); + iter->path = command; iter->id = id++; }

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011