February 2011 - Wine-Commits

Marcus Meissner : kernel32: Fixed mismatched bracket (Coverity).
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: b42c593f67e524034dbd07b38e1c5343260ed57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42c593f67e524034dbd07b38… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 05:21:42 2011 +0100 kernel32: Fixed mismatched bracket (Coverity). --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index f20bd4e..322c2ca 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -927,7 +927,7 @@ static void test_LoopbackRead(HANDLE hcom) i=0; do { - res = ReadFile(hcom, rbuf+read, sizeof(rbuf-read), &read1, NULL); + res = ReadFile(hcom, rbuf+read, sizeof(rbuf)-read, &read1, NULL); ok(res, "Readfile failed\n"); read += read1; i++;

1 0

Hans Leidekker : msi: A custom action dll failing to load is not a fatal error.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 288718d8c3e656311593ac0cb1811d500f4c0f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288718d8c3e656311593ac0cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 23 11:25:17 2011 +0100 msi: A custom action dll failing to load is not a fatal error. --- dlls/msi/custom.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c3f2302..83a750d 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -424,10 +424,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL /* keep a reference to prevent the dll from being unloaded */ if (dll && !(binary->module = LoadLibraryW( tmpfile ))) { - ERR("failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); - DeleteFileW( tmpfile ); - msi_free( binary ); - return NULL; + WARN( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); } binary->source = strdupW( source ); binary->tmpfile = strdupW( tmpfile ); @@ -720,8 +717,8 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) hModule = LoadLibraryW( dll ); if (!hModule) { - ERR("failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); - return r; + WARN( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + return ERROR_SUCCESS; } proc = strdupWtoA( function );

1 0

Jacek Caban : urlmon: Register MIME filter only for bindings testing them.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 6d887f072f5f8f777c4212eae6aebcc02dc721e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d887f072f5f8f777c4212eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:12:07 2011 +0100 urlmon: Register MIME filter only for bindings testing them. --- dlls/urlmon/tests/protocol.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 123fc03..33afe49 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2210,6 +2210,27 @@ static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; #define TEST_USEIURI 0x0400 #define TEST_IMPLPROTEX 0x0800 +static void register_filter(BOOL do_register) +{ + IInternetSession *session; + HRESULT hres; + + static const WCHAR gzipW[] = {'g','z','i','p',0}; + + hres = pCoInternetGetSession(0, &session, 0); + ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); + + if(do_register) { + hres = IInternetSession_RegisterMimeFilter(session, &mimefilter_cf, &IID_IInternetProtocol, gzipW); + ok(hres == S_OK, "RegisterMimeFilter failed: %08x\n", hres); + }else { + hres = IInternetSession_UnregisterMimeFilter(session, &mimefilter_cf, gzipW); + ok(hres == S_OK, "RegisterMimeFilter failed: %08x\n", hres); + } + + IInternetSession_Release(session); +} + static void init_test(int prot, DWORD flags) { tested_protocol = prot; @@ -2239,6 +2260,8 @@ static void init_test(int prot, DWORD flags) test_redirect = (flags & TEST_REDIRECT) != 0; test_abort = (flags & TEST_ABORT) != 0; impl_protex = (flags & TEST_IMPLPROTEX) != 0; + + register_filter(mimefilter_test); } static void test_priority(IInternetProtocol *protocol) @@ -3463,22 +3486,6 @@ static void test_binding(int prot, DWORD grf_pi, DWORD test_flags) IInternetSession_Release(session); } -static void register_filter(void) -{ - IInternetSession *session; - HRESULT hres; - - static const WCHAR gzipW[] = {'g','z','i','p',0}; - - hres = pCoInternetGetSession(0, &session, 0); - ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); - - hres = IInternetSession_RegisterMimeFilter(session, &mimefilter_cf, &IID_IInternetProtocol, gzipW); - ok(hres == S_OK, "RegisterMimeFilter failed: %08x\n", hres); - - IInternetSession_Release(session); -} - START_TEST(protocol) { HMODULE hurlmon; @@ -3504,8 +3511,6 @@ START_TEST(protocol) event_continue_done = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); - register_filter(); - test_file_protocol(); test_http_protocol(); test_https_protocol();

1 0

Juan Lang : cryptnet: Delete existing cache entries when out of date.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 2a53eb708796bdf07792c8c34ccb643c11fbfb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a53eb708796bdf07792c8c34… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 22 18:43:40 2011 -0800 cryptnet: Delete existing cache entries when out of date. --- dlls/cryptnet/cryptnet_main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e8e7adf..26e8fe7 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -740,11 +740,16 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, if (ret) lstrcpyW(cacheFileName, info->lpszLocalFileName); /* Check if the existing cache entry is up to date. If it isn't, - * overwite it with the new value. + * remove the existing cache entry, and create a new one with the + * new value. */ GetSystemTimeAsFileTime(&ft); if (CompareFileTime(&info->ExpireTime, &ft) < 0) + { create = TRUE; + DeleteUrlCacheEntryW(pszURL); + DeleteFileW(cacheFileName); + } CryptMemFree(info); } else

1 0

Alexandre Goujon : ws2_32: Make gethostbyname fail if WSAStartup was not called before.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 778757ba7434162edf35391f8a7b63b756b3ef59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778757ba7434162edf35391f8… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Tue Feb 22 21:02:22 2011 +0100 ws2_32: Make gethostbyname fail if WSAStartup was not called before. --- dlls/ws2_32/socket.c | 4 ++++ dlls/ws2_32/tests/sock.c | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f3a521c..f74fd36 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4606,6 +4606,10 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) int locerr = ENOBUFS; #endif char hostname[100]; + if(!num_startup) { + SetLastError(WSANOTINITIALISED); + return NULL; + } if( gethostname( hostname, 100) == -1) { SetLastError( WSAENOBUFS); /* appropriate ? */ return retval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index de647f1..d2f011f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -834,8 +834,6 @@ out: } /* Tests for WSAStartup */ - -/* This should fail. WSAStartup should be called before any network function is used. */ static void test_WithoutWSAStartup(void) { LPVOID ptr; @@ -843,8 +841,8 @@ static void test_WithoutWSAStartup(void) WSASetLastError(0xdeadbeef); ptr = gethostbyname("localhost"); - todo_wine ok(ptr == NULL, "gethostbyname() succeeded unexpectedly: %d\n", WSAGetLastError()); - todo_wine ok(WSAGetLastError() == WSANOTINITIALISED, "gethostbyname() failed with unexpected error: %d\n", + ok(ptr == NULL, "gethostbyname() succeeded unexpectedly: %d\n", WSAGetLastError()); + ok(WSAGetLastError() == WSANOTINITIALISED, "gethostbyname() failed with unexpected error: %d\n", WSAGetLastError()); }

1 0

Peter Schellenbach : oleaut32: Fixed short time & medium time named formats .
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 4f3b78797db0be5a1a5637513e36b7efe59ad213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3b78797db0be5a1a5637513… Author: Peter Schellenbach <pjs(a)asent.com> Date: Mon Feb 21 12:15:22 2011 -0800 oleaut32: Fixed short time & medium time named formats. --- dlls/oleaut32/tests/varformat.c | 25 +++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d83f218..b1fe73f 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -217,6 +217,14 @@ static const FMTDATERES VarFormat_date_results[] = { 40531.0, "ddd", "Sun" } }; +/* The following tests require that the time separator is a colon (:) */ +static const FMTDATERES VarFormat_namedtime_results[] = +{ + { 2.525, "short time", "12:36" }, + { 2.525, "medium time", "12:36 PM" }, + { 2.525, "long time", "12:36:00 PM" } +}; + #define VNUMFMT(vt,v) \ for (i = 0; i < sizeof(VarFormat_results)/sizeof(FMTRES); i++) \ { \ @@ -301,6 +309,23 @@ static void test_VarFormat(void) VarFormat_date_results[i].res); } + /* Named time formats */ + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIME, buff, sizeof(buff)/sizeof(char)); + if (buff[0] != ':' || buff[1]) + { + skip("Skipping namedtime tests as time separator is '%s'\n", buff); + } + else + { + for (i = 0; i < sizeof(VarFormat_namedtime_results)/sizeof(FMTDATERES); i++) + { + fd = 0; + VARFMT(VT_DATE,V_DATE,VarFormat_namedtime_results[i].val, + VarFormat_namedtime_results[i].fmt,S_OK, + VarFormat_namedtime_results[i].res); + } + } + /* Strings */ bstrin = SysAllocString(szTesting); VARFMT(VT_BSTR,V_BSTR,bstrin,"",S_OK,"testing"); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 529528b..e21ce96 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -263,7 +263,7 @@ typedef struct tagFMT_DATE_HEADER #define FMT_DATE_HOUR_0 0x1F /* Hours with leading 0 */ #define FMT_DATE_HOUR_12 0x20 /* Hours with no leading 0, 12 hour clock */ #define FMT_DATE_HOUR_12_0 0x21 /* Hours with leading 0, 12 hour clock */ -#define FMT_DATE_TIME_UNK2 0x23 +#define FMT_DATE_TIME_UNK2 0x23 /* same as FMT_DATE_HOUR_0, for "short time" format */ /* FIXME: probably missing some here */ #define FMT_DATE_AMPM_SYS1 0x2E /* AM/PM as defined by system settings */ #define FMT_DATE_AMPM_UPPER 0x2F /* Upper-case AM or PM */ @@ -1660,6 +1660,13 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, pToken += 2; break; + case FMT_GEN_INLINE: + pToken += 2; + TRACE("copy %s\n", debugstr_a((LPCSTR)pToken)); + while (*pToken) + *pBuff++ = *pToken++; + break; + case FMT_DATE_TIME_SEP: TRACE("time separator\n"); localeValue = LOCALE_STIME; @@ -1836,6 +1843,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, break; case FMT_DATE_HOUR_0: + case FMT_DATE_TIME_UNK2: szPrintFmt = szPercentZeroTwo_d; dwVal = udate.st.wHour; break;

1 0

Alistair Leslie-Hughes : msxml3: Add IObjectSafety support to IXMLHTTPRequest.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 955685a777265ffc85b89fc9615cb5b5da9f32a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955685a777265ffc85b89fc96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 19 15:51:29 2011 +1100 msxml3: Add IObjectSafety support to IXMLHTTPRequest. --- dlls/msxml3/httprequest.c | 75 +++++++++++++ dlls/msxml3/tests/domdoc.c | 264 ++++++++++++++++++++++++-------------------- 2 files changed, 218 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=955685a777265ffc85b89…

1 0

Hans Leidekker : appwiz.cpl: List 32-bit applications on 64-bit platforms.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 013e92c9cd14d15111710b7771c7666cb9016d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=013e92c9cd14d15111710b777… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 22 13:23:19 2011 +0100 appwiz.cpl: List 32-bit applications on 64-bit platforms. --- dlls/appwiz.cpl/appwiz.c | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 83da7d9..957b8bf 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -145,37 +145,26 @@ static void FreeAppInfo(APPINFO *info) * Name : ReadApplicationsFromRegistry * Description: Creates a linked list of uninstallable applications from the * registry. - * Parameters : root - Which registry root to read from (HKCU/HKLM) + * Parameters : root - Which registry root to read from * Returns : TRUE if successful, FALSE otherwise */ static BOOL ReadApplicationsFromRegistry(HKEY root) { - HKEY hkeyUninst, hkeyApp; + HKEY hkeyApp; int i, id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; DWORD dwNoModify, dwType, value; WCHAR subKeyName[256]; - WCHAR key_app[MAX_STRING_LEN]; - WCHAR *p, *command; + WCHAR *command; APPINFO *info = NULL; LPWSTR iconPtr; - BOOL ret = FALSE; - - if (RegOpenKeyExW(root, PathUninstallW, 0, KEY_READ, &hkeyUninst) != - ERROR_SUCCESS) - return FALSE; - - lstrcpyW(key_app, PathUninstallW); - lstrcatW(key_app, BackSlashW); - p = key_app+lstrlenW(PathUninstallW)+1; sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); - for (i = 0; RegEnumKeyExW(hkeyUninst, i, subKeyName, &sizeOfSubKeyName, NULL, + for (i = 0; RegEnumKeyExW(root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS; ++i) { - lstrcpyW(p, subKeyName); - RegOpenKeyExW(root, key_app, 0, KEY_READ, &hkeyApp); + RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); displen = 0; uninstlen = 0; @@ -313,16 +302,11 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); } - ret = TRUE; - goto end; - + return TRUE; err: RegCloseKey(hkeyApp); if (info) FreeAppInfo(info); - -end: - RegCloseKey(hkeyUninst); - return ret; + return FALSE; } @@ -773,7 +757,9 @@ static HIMAGELIST AddListViewImageList(HWND hWnd) */ static HIMAGELIST ResetApplicationList(BOOL bFirstRun, HWND hWnd, HIMAGELIST hImageList) { + static const BOOL is_64bit = sizeof(void *) > sizeof(int); HWND hWndListView; + HKEY hkey; hWndListView = GetDlgItem(hWnd, IDL_PROGRAMS); @@ -796,8 +782,22 @@ static HIMAGELIST ResetApplicationList(BOOL bFirstRun, HWND hWnd, HIMAGELIST hIm /* now create the image list and add the applications to the listview */ hImageList = AddListViewImageList(hWndListView); - ReadApplicationsFromRegistry(HKEY_LOCAL_MACHINE); - ReadApplicationsFromRegistry(HKEY_CURRENT_USER); + if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ, &hkey)) + { + ReadApplicationsFromRegistry(hkey); + RegCloseKey(hkey); + } + if (is_64bit && + !RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ|KEY_WOW64_32KEY, &hkey)) + { + ReadApplicationsFromRegistry(hkey); + RegCloseKey(hkey); + } + if (!RegOpenKeyExW(HKEY_CURRENT_USER, PathUninstallW, 0, KEY_READ, &hkey)) + { + ReadApplicationsFromRegistry(hkey); + RegCloseKey(hkey); + } AddApplicationsToList(hWndListView, hImageList); UpdateButtons(hWnd);

1 0

Andrew Nguyen : configure: Check for a modern sched_setaffinity prototype.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 2f22a504e789625bcaf65d854594a835a67f271d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f22a504e789625bcaf65d854… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 22 07:10:22 2011 -0600 configure: Check for a modern sched_setaffinity prototype. --- configure | 35 ++++++++++++++++++++++++++++++++++- configure.ac | 10 +++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a19e6b8..40e2e20 100755 --- a/configure +++ b/configure @@ -12818,7 +12818,6 @@ for ac_func in \ pwrite \ readdir \ readlink \ - sched_setaffinity \ sched_yield \ select \ setproctitle \ @@ -13317,6 +13316,40 @@ $as_echo "#define HAVE_ONE_ARG_MKDIR 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_setaffinity" >&5 +$as_echo_n "checking for sched_setaffinity... " >&6; } +if test "${wine_cv_have_sched_setaffinity+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _GNU_SOURCE +#include <sched.h> +int +main () +{ +sched_setaffinity(0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + wine_cv_have_sched_setaffinity=yes +else + wine_cv_have_sched_setaffinity=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_sched_setaffinity" >&5 +$as_echo "$wine_cv_have_sched_setaffinity" >&6; } +if test "$wine_cv_have_sched_setaffinity" = "yes" +then + +$as_echo "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } diff --git a/configure.ac b/configure.ac index a68ca49..04e3430 100644 --- a/configure.ac +++ b/configure.ac @@ -1947,7 +1947,6 @@ AC_CHECK_FUNCS(\ pwrite \ readdir \ readlink \ - sched_setaffinity \ sched_yield \ select \ setproctitle \ @@ -2049,6 +2048,15 @@ then AC_DEFINE(HAVE_ONE_ARG_MKDIR, 1, [Define if mkdir takes only one argument]) fi +AC_CACHE_CHECK([for sched_setaffinity],wine_cv_have_sched_setaffinity, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sched.h>]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no])) +if test "$wine_cv_have_sched_setaffinity" = "yes" +then + AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) +fi + dnl **** Check for types **** AC_C_CONST

1 0

Hans Leidekker : uninstaller: List 32-bit applications on 64-bit platforms.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 7b2604e5f9965ab09c48efc0ba486df88ecff435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2604e5f9965ab09c48efc0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 22 13:23:30 2011 +0100 uninstaller: List 32-bit applications on 64-bit platforms. --- programs/uninstaller/main.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 5d74ea8..c85bf5a 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -174,25 +174,15 @@ static int cmp_by_name(const void *a, const void *b) */ static int FetchFromRootKey(HKEY root) { - HKEY hkeyUninst, hkeyApp; + HKEY hkeyApp; int i; DWORD sizeOfSubKeyName, displen, uninstlen; WCHAR subKeyName[256]; - WCHAR key_app[1024]; - WCHAR *p; - - if (RegOpenKeyExW(root, PathUninstallW, 0, KEY_READ, &hkeyUninst) != ERROR_SUCCESS) - return 0; - - lstrcpyW(key_app, PathUninstallW); - lstrcatW(key_app, BackSlashW); - p = key_app+lstrlenW(PathUninstallW)+1; sizeOfSubKeyName = 255; - for (i=0; RegEnumKeyExW( hkeyUninst, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL ) != ERROR_NO_MORE_ITEMS; ++i) + for (i=0; RegEnumKeyExW( root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL ) != ERROR_NO_MORE_ITEMS; ++i) { - lstrcpyW(p, subKeyName); - RegOpenKeyExW(root, key_app, 0, KEY_READ, &hkeyApp); + RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); if (!RegQueryValueExW(hkeyApp, DisplayNameW, NULL, NULL, NULL, &displen)) { DWORD value, type; @@ -232,22 +222,37 @@ static int FetchFromRootKey(HKEY root) RegCloseKey(hkeyApp); sizeOfSubKeyName = 255; } - RegCloseKey(hkeyUninst); return 1; } static int FetchUninstallInformation(void) { - int rc; + static const BOOL is_64bit = sizeof(void *) > sizeof(int); + int rc = 0; + HKEY root; numentries = 0; oldsel = -1; if (!entries) entries = HeapAlloc(GetProcessHeap(), 0, sizeof(uninst_entry)); - rc = FetchFromRootKey(HKEY_LOCAL_MACHINE); - rc |= FetchFromRootKey(HKEY_CURRENT_USER); + if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ, &root)) + { + rc |= FetchFromRootKey(root); + RegCloseKey(root); + } + if (is_64bit && + !RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ|KEY_WOW64_32KEY, &root)) + { + rc |= FetchFromRootKey(root); + RegCloseKey(root); + } + if (!RegOpenKeyExW(HKEY_CURRENT_USER, PathUninstallW, 0, KEY_READ, &root)) + { + rc |= FetchFromRootKey(root); + RegCloseKey(root); + } qsort(entries, numentries, sizeof(uninst_entry), cmp_by_name); return rc;

1 0