April 2011 - Wine-Commits - list.winehq.org

Nikolay Sivov : oleview: Fix a crash on null helpstring and name on library level.
by Alexandre Julliard April 7, 2011

April 7, 2011

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

Jerome Leclanche : winemenubuilder: Add a trailing semicolon to MimeType in desktop files.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 56a8f271ba1124edef5dae5d1c3c97e173e7f360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a8f271ba1124edef5dae5d1… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Dec 13 17:17:17 2010 +0000 winemenubuilder: Add a trailing semicolon to MimeType in desktop files. (cherry picked from commit 33c7105ecf8b1f7243c001de2fce1e85d4c150d8) --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8ee8387..ce28e3b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2190,7 +2190,7 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c fprintf(desktop, "[Desktop Entry]\n"); fprintf(desktop, "Type=Application\n"); fprintf(desktop, "Name=%s\n", friendlyAppName); - fprintf(desktop, "MimeType=%s\n", mimeType); + fprintf(desktop, "MimeType=%s;\n", mimeType); fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n");

1 0

Andrew Nguyen : wineboot: Set the FeatureSet value in the volatile CPU registry keys.
by Alexandre Julliard April 7, 2011

April 7, 2011

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

Hans Leidekker : appwiz.cpl: Run msiexec if the WindowsInstaller value is set.
by Alexandre Julliard April 7, 2011

April 7, 2011

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

Alexandre Julliard : advapi32: Fix array size construct that gcc doesn' t like.
by Alexandre Julliard April 7, 2011

April 7, 2011

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

Nikolay Sivov : oleview: Fix some crashes on unnamed variables.
by Alexandre Julliard April 7, 2011

April 7, 2011

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

Alexandre Julliard : loader: Make sure the new stack is 16-byte aligned in the preloader.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 177e15df4bb1c4e926df17a0847fd2d3c85ca461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177e15df4bb1c4e926df17a08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 16:52:02 2010 +0100 loader: Make sure the new stack is 16-byte aligned in the preloader. (cherry picked from commit 144cb78dbaeedcc36946907c5ccf391ecb011f04) --- loader/preloader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 2dc2872..8524ba5 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -512,18 +512,19 @@ static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, src = (char *)*stack; dst = src - (new_count - delete_count) * sizeof(*av); - if (new_count > delete_count) /* need to make room for the extra values */ + dst = (char *)((unsigned long)dst & ~15); + if (dst < src) /* need to make room for the extra values */ { int len = (char *)(av + av_count + 1) - src; for (i = 0; i < len; i++) dst[i] = src[i]; } - else if (new_count < delete_count) /* get rid of unused values */ + else if (dst > src) /* get rid of unused values */ { int len = (char *)(av + av_count + 1) - src; for (i = len - 1; i >= 0; i--) dst[i] = src[i]; } *stack = dst; - av -= (new_count - delete_count); + av = (ElfW(auxv_t) *)((char *)av + (dst - src)); /* now set the values */ for (j = 0; new_av[j].a_type != AT_NULL; j++)

1 0

Alexandre Julliard : ntdll: Don't worry about the DOS area on non-x86.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 386ad8eaf78d322b2a57b5e46a7fee60037a8741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=386ad8eaf78d322b2a57b5e46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 10:25:14 2010 +0100 ntdll: Don't worry about the DOS area on non-x86. (cherry picked from commit e39c6d0474eebea464b37dfdc557b703282129a2) --- dlls/ntdll/virtual.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 32b60a7..2a31bad 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -122,6 +122,7 @@ static RTL_CRITICAL_SECTION csVirtual = { &critsect_debug, -1, 0, 0, 0, 0 }; static void *address_space_limit = (void *)0xc0000000; /* top of the total available address space */ static void *user_space_limit = (void *)0x7fff0000; /* top of the user address space */ static void *working_set_limit = (void *)0x7fff0000; /* top of the current working set */ +static void *address_space_start = (void *)0x110000; /* keep DOS area clear */ #elif defined(__x86_64__) # define page_mask 0xfff # define page_shift 12 @@ -129,6 +130,7 @@ static void *working_set_limit = (void *)0x7fff0000; /* top of the current wo static void *address_space_limit = (void *)0x7fffffff0000; static void *user_space_limit = (void *)0x7fffffff0000; static void *working_set_limit = (void *)0x7fffffff0000; +static void *address_space_start = (void *)0x10000; #else static UINT page_shift; static UINT_PTR page_size; @@ -136,6 +138,7 @@ static UINT_PTR page_mask; static void *address_space_limit; static void *user_space_limit; static void *working_set_limit; +static void *address_space_start = (void *)0x10000; #endif /* __i386__ */ #define ROUND_ADDR(addr,mask) \ @@ -1044,7 +1047,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (base >= (char *)0x110000) /* make sure the DOS area remains free */ + if (base >= (char *)address_space_start) /* make sure the DOS area remains free */ status = map_view( &view, base, total_size, mask, FALSE, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); @@ -1335,6 +1338,7 @@ void virtual_init(void) { const char *preload; void *heap_base; + size_t size; struct file_view *heap_view; #ifndef page_mask @@ -1365,9 +1369,10 @@ void virtual_init(void) VIRTUAL_HEAP_SIZE, NULL, NULL ); create_view( &heap_view, heap_base, VIRTUAL_HEAP_SIZE, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE ); - /* make the DOS area accessible to hide bugs in broken apps like Excel 2003 */ - if (wine_mmap_is_in_reserved_area( (void *)0x10000, 0x100000 ) == 1) - wine_anon_mmap( (void *)0x10000, 0x100000, PROT_READ | PROT_WRITE, MAP_FIXED ); + /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ + size = (char *)address_space_start - (char *)0x10000; + if (size && wine_mmap_is_in_reserved_area( (void*)0x10000, size ) == 1) + wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED ); }

1 0

Alexandre Julliard : winecfg: Set Wow64 registry keys as well as the 64-bit ones for version information .
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: baa48dd07d895de1fee7443686f7c3937e97e436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa48dd07d895de1fee744368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 22:30:18 2010 +0100 winecfg: Set Wow64 registry keys as well as the 64-bit ones for version information. (cherry picked from commit d15d52ddab95d246cf20f4fbc0f1674d1b777b83) --- programs/winecfg/winecfg.c | 62 ++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 25 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 1abf8ed..c41d2ba 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -34,6 +34,7 @@ #include <limits.h> #include <windows.h> #include <winreg.h> +#include <wine/unicode.h> #include <wine/debug.h> #include <wine/list.h> @@ -42,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #include "winecfg.h" #include "resource.h" +static const int is_win64 = (sizeof(void *) > sizeof(int)); + HKEY config_key = NULL; HMENU hPopupMenus = 0; @@ -159,7 +162,8 @@ end: * * If valueName or value is NULL, an empty section will be created */ -static int set_config_key(HKEY root, const WCHAR *subkey, const WCHAR *name, const void *value, DWORD type) { +static int set_config_key(HKEY root, const WCHAR *subkey, REGSAM access, const WCHAR *name, const void *value, DWORD type) +{ DWORD res = 1; HKEY key = NULL; @@ -170,7 +174,8 @@ static int set_config_key(HKEY root, const WCHAR *subkey, const WCHAR *name, con if (subkey[0]) { - res = RegCreateKeyW(root, subkey, &key); + res = RegCreateKeyExW( root, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, + access, NULL, &key, NULL ); if (res != ERROR_SUCCESS) goto end; } else key = root; @@ -192,25 +197,6 @@ end: return res; } -/* removes the requested value from the registry, however, does not - * remove the section if empty. Returns S_OK (0) on success. - */ -static HRESULT remove_value(HKEY root, const WCHAR *subkey, const WCHAR *name) -{ - HRESULT hr; - HKEY key; - - WINE_TRACE("subkey=%s, name=%s\n", wine_dbgstr_w(subkey), wine_dbgstr_w(name)); - - hr = RegOpenKeyW(root, subkey, &key); - if (hr != S_OK) return hr; - - hr = RegDeleteValueW(key, name); - if (hr != ERROR_SUCCESS) return hr; - - return S_OK; -} - /* ========================================================================= */ /* This code exists for the following reasons: @@ -635,17 +621,43 @@ BOOL reg_key_exists(HKEY root, const char *path, const char *name) static void process_setting(struct setting *s) { + static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; + HKEY key; + BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && + !strncmpiW( s->path, softwareW, sizeof(softwareW)/sizeof(WCHAR) )); + if (s->value) { WINE_TRACE("Setting %s:%s to '%s'\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name), wine_dbgstr_w(s->value)); - set_config_key(s->root, s->path, s->name, s->value, s->type); + set_config_key(s->root, s->path, MAXIMUM_ALLOWED, s->name, s->value, s->type); + if (needs_wow64) + { + WINE_TRACE("Setting 32-bit %s:%s to '%s'\n", wine_dbgstr_w(s->path), + wine_dbgstr_w(s->name), wine_dbgstr_w(s->value)); + set_config_key(s->root, s->path, MAXIMUM_ALLOWED | KEY_WOW64_32KEY, s->name, s->value, s->type); + } } else { - /* NULL name means remove that path/section entirely */ - if (s->path && s->name) remove_value(s->root, s->path, s->name); - else if (s->path && !s->name) RegDeleteTreeW(s->root, s->path); + WINE_TRACE("Removing %s:%s\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name)); + if (!RegOpenKeyW( s->root, s->path, &key )) + { + /* NULL name means remove that path/section entirely */ + if (s->name) RegDeleteValueW( key, s->name ); + else RegDeleteTreeW( key, NULL ); + RegCloseKey( key ); + } + if (needs_wow64) + { + WINE_TRACE("Removing 32-bit %s:%s\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name)); + if (!RegOpenKeyExW( s->root, s->path, 0, MAXIMUM_ALLOWED | KEY_WOW64_32KEY, &key )) + { + if (s->name) RegDeleteValueW( key, s->name ); + else RegDeleteTreeW( key, NULL ); + RegCloseKey( key ); + } + } } }

1 0

Alexandre Julliard : wineboot: Relaunch the 64-bit version of wineboot on Wow64.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 871d028c0980079de7f158ef61f85806e6b72eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=871d028c0980079de7f158ef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 22:29:25 2010 +0100 wineboot: Relaunch the 64-bit version of wineboot on Wow64. (cherry picked from commit 9b3483899225a0232b6ebc22597a1d1d836ab7dd) --- programs/wineboot/wineboot.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 3f16445..b69ceed 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1122,11 +1122,36 @@ int main( int argc, char *argv[] ) int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0, update = 0; HANDLE event; SECURITY_ATTRIBUTES sa; + BOOL is_wow64; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } + while ((optc = getopt_long(argc, argv, short_options, long_options, NULL )) != -1) { switch(optc)

1 0