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

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

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

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

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

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 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

Austin English : ntdll: Bump win2k3 version information to sp2.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 57c86aa65a4da28d3b86de78620d73ed4eefa4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c86aa65a4da28d3b86de786… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Dec 10 20:51:04 2010 +0000 ntdll: Bump win2k3 version information to sp2. (cherry picked from commit b06cd31fe4b202fe8f054d1269012b85514af9e9) --- dlls/ntdll/version.c | 4 ++-- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index e109905..46385c9 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -135,8 +135,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* WIN2K3 */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, - 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, + 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, /* WINVISTA */ { diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 39ecd4e..2b35aeb 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -51,7 +51,7 @@ static const struct { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, - { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, + { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"}, { "winme", "Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""},

1 0

Alexandre Julliard : ntdll: Ensure alignment of static TLS data and free it at thread exit.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 7f92f04ba6529bc993654ad5798bb7f99b2c7002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f92f04ba6529bc993654ad57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 13:16:55 2010 +0100 ntdll: Ensure alignment of static TLS data and free it at thread exit. (cherry picked from commit e272b31b6bdc87307019c00da1be097c23a19e0e) --- dlls/ntdll/loader.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c30243e..04c04ac 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -97,6 +97,8 @@ static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ static UINT tls_total_size; /* total size of TLS storage */ static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ +#define TLS_ALIGNMENT (2 * sizeof(void *)) +#define TLS_ALIGN(size) (((size) + TLS_ALIGNMENT - 1) & ~(TLS_ALIGNMENT - 1)) static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -843,7 +845,7 @@ static NTSTATUS alloc_process_tls(void) continue; size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill; if (!size && !dir->AddressOfCallBacks) continue; - tls_total_size += size; + tls_total_size += TLS_ALIGN(size); tls_module_count++; } if (!tls_module_count) return STATUS_SUCCESS; @@ -878,24 +880,19 @@ static NTSTATUS alloc_thread_tls(void) { void **pointers; char *data; - UINT i; + UINT i, size; if (!tls_module_count) return STATUS_SUCCESS; - if (!(pointers = RtlAllocateHeap( GetProcessHeap(), 0, - tls_module_count * sizeof(*pointers) ))) + size = TLS_ALIGN( tls_module_count * sizeof(*pointers) ); + if (!(pointers = RtlAllocateHeap( GetProcessHeap(), 0, size + tls_total_size ))) return STATUS_NO_MEMORY; - - if (!(data = RtlAllocateHeap( GetProcessHeap(), 0, tls_total_size ))) - { - RtlFreeHeap( GetProcessHeap(), 0, pointers ); - return STATUS_NO_MEMORY; - } + data = (char *)pointers + size; for (i = 0; i < tls_module_count; i++) { const IMAGE_TLS_DIRECTORY *dir = tls_dirs[i]; - ULONG size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; + size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; TRACE( "thread %04x idx %d: %d/%d bytes from %p to %p\n", GetCurrentThreadId(), i, size, dir->SizeOfZeroFill, @@ -903,9 +900,8 @@ static NTSTATUS alloc_thread_tls(void) pointers[i] = data; memcpy( data, (void *)dir->StartAddressOfRawData, size ); - data += size; - memset( data, 0, dir->SizeOfZeroFill ); - data += dir->SizeOfZeroFill; + memset( data + size, 0, dir->SizeOfZeroFill ); + data += TLS_ALIGN( size + dir->SizeOfZeroFill ); } NtCurrentTeb()->ThreadLocalStoragePointer = pointers; return STATUS_SUCCESS;

1 0

Alexandre Julliard : ntdll: Don't worry about the DOS area on non-x86.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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

Hans Leidekker : wineboot: Set the USERDOMAIN environment variable.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 6106dd8a26731a2c19e20644cb56226e3ee9a776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6106dd8a26731a2c19e20644c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 15 09:09:10 2010 +0100 wineboot: Set the USERDOMAIN environment variable. Microsoft Robotics Developer Studio installer needs this. (cherry picked from commit 86a7b45a7a43c8357f5d70f3429899d00b54e0a0) --- 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 02d3746..3f16445 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -309,6 +309,7 @@ static void create_volatile_environment_registry_key(void) static const WCHAR LogonServerW[] = {'L','O','G','O','N','S','E','R','V','E','R',0}; static const WCHAR SessionNameW[] = {'S','E','S','S','I','O','N','N','A','M','E',0}; static const WCHAR UserNameW[] = {'U','S','E','R','N','A','M','E',0}; + static const WCHAR UserDomainW[] = {'U','S','E','R','D','O','M','A','I','N',0}; static const WCHAR UserProfileW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; static const WCHAR ConsoleW[] = {'C','o','n','s','o','l','e',0}; static const WCHAR EmptyW[] = {0}; @@ -350,6 +351,7 @@ static void create_volatile_environment_registry_key(void) size = sizeof(computername) - 2; if (GetComputerNameW(&computername[2], &size)) { + set_reg_value( hkey, UserDomainW, &computername[2] ); computername[0] = computername[1] = '\\'; set_reg_value( hkey, LogonServerW, computername ); }

1 0