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

Hans Leidekker : wineboot: Set the USERDOMAIN environment variable.
by Alexandre Julliard April 7, 2011

April 7, 2011

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

Kirill Smelkov : kernel32: Support deleting resources in UpdateResource.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: f7d9db83662c304bad680178038d70059f4b33d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d9db83662c304bad6801780… Author: Kirill Smelkov <kirr(a)landau.phys.spbu.ru> Date: Tue Dec 21 17:23:11 2010 +0300 kernel32: Support deleting resources in UpdateResource. (cherry picked from commit d5cb11a45a3aab5ac372e571b55e1fc35709f13d) --- dlls/kernel32/resource.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 0050cb9..8876b1a 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -706,7 +706,8 @@ static void res_free_str( LPWSTR str ) } static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name, - struct resource_data *resdata, BOOL overwrite_existing ) + LANGID Lang, struct resource_data *resdata, + BOOL overwrite_existing ) { struct resource_dir_entry *restype, *resname; struct resource_data *existing; @@ -736,7 +737,7 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N * If there's an existing resource entry with matching (Type,Name,Language) * it needs to be removed before adding the new data. */ - existing = find_resource_data( &resname->children, resdata->lang ); + existing = find_resource_data( &resname->children, Lang ); if (existing) { if (!overwrite_existing) @@ -745,7 +746,8 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N HeapFree( GetProcessHeap(), 0, existing ); } - add_resource_data_entry( &resname->children, resdata ); + if (resdata) + add_resource_data_entry( &resname->children, resdata ); return TRUE; } @@ -1007,7 +1009,7 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, resdata = allocate_resource_data( Lang, data->CodePage, p, data->Size, FALSE ); if (resdata) { - if (!update_add_resource( updates, Type, Name, resdata, FALSE )) + if (!update_add_resource( updates, Type, Name, Lang, resdata, FALSE )) HeapFree( GetProcessHeap(), 0, resdata ); } } @@ -1639,10 +1641,17 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, LPCWSTR lpType, LPCWSTR lpName, updates = GlobalLock(hUpdate); if (updates) { - struct resource_data *data; - data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE ); - if (data) - ret = update_add_resource( updates, lpType, lpName, data, TRUE ); + if (lpData == NULL && cbData == 0) /* remove resource */ + { + ret = update_add_resource( updates, lpType, lpName, wLanguage, NULL, TRUE ); + } + else + { + struct resource_data *data; + data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE ); + if (data) + ret = update_add_resource( updates, lpType, lpName, wLanguage, data, TRUE ); + } GlobalUnlock(hUpdate); } return ret;

1 0

Alexandre Julliard : kernel32: Update the environment variables that vary across 32-bit/64-bit/Wow64.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 6b22940d329ac7f974cfb89fe8a3b0f93ea91ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b22940d329ac7f974cfb89fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 22:48:44 2010 +0100 kernel32: Update the environment variables that vary across 32-bit/64-bit/Wow64. (cherry picked from commit 01af5452c55c06ef827be23007482880649070d3) --- dlls/kernel32/process.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1e4a6e1..e5e33f2 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -541,6 +541,87 @@ static void set_additional_environment(void) } /*********************************************************************** + * set_wow64_environment + * + * Set the environment variables that change across 32/64/Wow64. + */ +static void set_wow64_environment(void) +{ + static const WCHAR archW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; + static const WCHAR arch6432W[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','W','6','4','3','2',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR versionW[] = {'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; + static const WCHAR progdirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',0}; + static const WCHAR progdir86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; + static const WCHAR progfilesW[] = {'P','r','o','g','r','a','m','F','i','l','e','s',0}; + static const WCHAR progw6432W[] = {'P','r','o','g','r','a','m','W','6','4','3','2',0}; + static const WCHAR commondirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',0}; + static const WCHAR commondir86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; + static const WCHAR commonfilesW[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s',0}; + static const WCHAR commonw6432W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','W','6','4','3','2',0}; + + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + WCHAR arch[64]; + WCHAR *value; + HANDLE hkey; + + /* set the PROCESSOR_ARCHITECTURE variable */ + + if (GetEnvironmentVariableW( arch6432W, arch, sizeof(arch) )) + { + if (is_win64) + { + SetEnvironmentVariableW( archW, arch ); + SetEnvironmentVariableW( arch6432W, NULL ); + } + } + else if (GetEnvironmentVariableW( archW, arch, sizeof(arch) )) + { + if (is_wow64) + { + SetEnvironmentVariableW( arch6432W, arch ); + SetEnvironmentVariableW( archW, x86W ); + } + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, versionW ); + if (NtOpenKey( &hkey, KEY_READ | KEY_WOW64_64KEY, &attr )) return; + + /* set the ProgramFiles variables */ + + if ((value = get_reg_value( hkey, progdirW ))) + { + if (is_win64 || is_wow64) SetEnvironmentVariableW( progw6432W, value ); + if (is_win64 || !is_wow64) SetEnvironmentVariableW( progfilesW, value ); + } + if (is_wow64 && (value = get_reg_value( hkey, progdir86W ))) + SetEnvironmentVariableW( progfilesW, value ); + + /* set the CommonProgramFiles variables */ + + if ((value = get_reg_value( hkey, commondirW ))) + { + if (is_win64 || is_wow64) SetEnvironmentVariableW( commonw6432W, value ); + if (is_win64 || !is_wow64) SetEnvironmentVariableW( commonfilesW, value ); + } + if (is_wow64 && (value = get_reg_value( hkey, commondir86W ))) + SetEnvironmentVariableW( commonfilesW, value ); + + NtClose( hkey ); +} + +/*********************************************************************** * set_library_wargv * * Set the Wine library Unicode argv global variables. @@ -1124,6 +1205,7 @@ void CDECL __wine_kernel_init(void) set_registry_environment( got_environment ); set_additional_environment(); } + set_wow64_environment(); if (!(peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ))) {

1 0

Tristan Schmelcher : ddeml: Fix incorrect HSZ argument sizes.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: f130dc89307443cbd635c3ae3daff9adbc3a7011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f130dc89307443cbd635c3ae3… Author: Tristan Schmelcher <tristan_schmelcher(a)alumni.uwaterloo.ca> Date: Mon Nov 29 20:12:24 2010 -0800 ddeml: Fix incorrect HSZ argument sizes. (cherry picked from commit 9f43630ee08731d34b1b8f714d0f33e0b2e8964a) --- dlls/ddeml.dll16/ddeml.dll16.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddeml.dll16/ddeml.dll16.spec b/dlls/ddeml.dll16/ddeml.dll16.spec index 3f03b7c..73fd461 100644 --- a/dlls/ddeml.dll16/ddeml.dll16.spec +++ b/dlls/ddeml.dll16/ddeml.dll16.spec @@ -1,6 +1,6 @@ 2 pascal -ret16 DdeInitialize(ptr segptr long long) DdeInitialize16 3 pascal -ret16 DdeUninitialize(long) DdeUninitialize16 -4 pascal DdeConnectList(long word word word ptr) DdeConnectList16 +4 pascal DdeConnectList(long long long word ptr) DdeConnectList16 5 pascal DdeQueryNextServer(long long) DdeQueryNextServer16 6 pascal -ret16 DdeDisconnectList(long) DdeDisconnectList16 7 pascal DdeConnect(long long long ptr) DdeConnect16 @@ -9,8 +9,8 @@ 10 pascal -ret16 DdeSetUserHandle(long long long) DdeSetUserHandle16 11 pascal DdeClientTransaction(ptr long long long s_word s_word long ptr) DdeClientTransaction16 12 pascal -ret16 DdeAbandonTransaction(long long long) DdeAbandonTransaction16 -13 pascal -ret16 DdePostAdvise(long word word) DdePostAdvise16 -14 pascal DdeCreateDataHandle(long ptr long long word word word) DdeCreateDataHandle16 +13 pascal -ret16 DdePostAdvise(long long long) DdePostAdvise16 +14 pascal DdeCreateDataHandle(long ptr long long long word word) DdeCreateDataHandle16 15 pascal DdeAddData(word ptr long long) DdeAddData16 16 pascal DdeGetData(word ptr long long) DdeGetData16 17 pascal DdeAccessData(word ptr) DdeAccessData16 @@ -19,11 +19,11 @@ 20 pascal -ret16 DdeGetLastError(long) DdeGetLastError16 21 pascal DdeCreateStringHandle(long str s_word) DdeCreateStringHandle16 22 pascal -ret16 DdeFreeStringHandle(long long) DdeFreeStringHandle16 -23 pascal DdeQueryString (long word ptr long word) DdeQueryString16 +23 pascal DdeQueryString (long long ptr long word) DdeQueryString16 24 pascal -ret16 DdeKeepStringHandle(long long) DdeKeepStringHandle16 26 pascal -ret16 DdeEnableCallback(long long word) DdeEnableCallback16 27 pascal DdeNameService(long long long s_word) DdeNameService16 -36 pascal -ret16 DdeCmpStringHandles(word word) DdeCmpStringHandles16 +36 pascal -ret16 DdeCmpStringHandles(long long) DdeCmpStringHandles16 37 pascal DdeReconnect(long) DdeReconnect

1 0

Eric Pouech : winedbg: Don't print extra \n in print_basic.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: f609b1b80ec3f8130d4913fa09474928d3312627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f609b1b80ec3f8130d4913fa0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 26 15:21:05 2010 +0100 winedbg: Don't print extra \n in print_basic. (cherry picked from commit dc6b9c2a58c504e8bf54e34dcbe181e0a7137988) --- programs/winedbg/memory.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 7d6112a..8aebff2 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -546,7 +546,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) case 'd': dbg_print_longlong(res, TRUE); - dbg_printf("\n"); return; case 'c': @@ -570,7 +569,6 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) if (lvalue->type.id == dbg_itype_segptr) { dbg_print_longlong(types_extract_as_longlong(lvalue, NULL), TRUE); - dbg_printf("\n"); } else print_typed_basic(lvalue); }

1 0

Hans Leidekker : advapi32: Return the computer name as referenced domain name in LookupAccountName.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: a286ae91a6990fcd47735ec4ee2ea48e27b7fa07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a286ae91a6990fcd47735ec4e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 12:53:25 2010 +0100 advapi32: Return the computer name as referenced domain name in LookupAccountName. (cherry picked from commit eba814763a654d1c982f2142b6a70cf7d0ae1590) --- dlls/advapi32/security.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2d0ed48..e8d7927 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2629,9 +2629,8 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo HANDLE token; BOOL ret; PSID pSid; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD nameLen; - LPCWSTR domainName; if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) { @@ -2655,9 +2654,12 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo } *cbSid = GetLengthSid(pSid); - domainName = dm; - nameLen = strlenW(domainName); - + nameLen = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(domainName, &nameLen)) + { + domainName[0] = 0; + nameLen = 0; + } if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2683,9 +2685,8 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc { MAX_SID local; BOOL ret; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD nameLen; - LPCWSTR domainName; if ((ret = ADVAPI_GetComputerSid(&local))) { @@ -2699,9 +2700,12 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc *cbSid = GetLengthSid(&local); } - domainName = dm; - nameLen = strlenW(domainName); - + nameLen = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(domainName, &nameLen)) + { + domainName[0] = 0; + nameLen = 0; + } if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2898,11 +2902,12 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI BOOL ret, handled; LSA_UNICODE_STRING account; - FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), + TRACE("%s %s %p %p %p %p %p\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); if (!ADVAPI_IsLocalComputer( lpSystemName )) { + FIXME("remote computer not supported\n"); SetLastError( RPC_S_SERVER_UNAVAILABLE ); return FALSE; }

1 0

Tristan Schmelcher : ddeml: More calling convention fixes.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 64d054efe8c5948201efb6914ac3b8fb4ea2a903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d054efe8c5948201efb6914… Author: Tristan Schmelcher <tristan_schmelcher(a)alumni.uwaterloo.ca> Date: Wed Dec 1 12:32:46 2010 -0800 ddeml: More calling convention fixes. (cherry picked from commit 8fb6b02d946d751a9c26c20d94c71a83e1088349) --- dlls/ddeml.dll16/ddeml.c | 6 ++++++ dlls/ddeml.dll16/ddeml.dll16.spec | 18 +++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index e0a9dda..c7cbd51 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -386,6 +386,12 @@ HDDEDATA WINAPI DdeClientTransaction16(LPVOID pData, DWORD cbData, HCONV hConv, HSZ hszItem, UINT16 wFmt, UINT16 wType, DWORD dwTimeout, LPDWORD pdwResult) { + if (cbData != (DWORD)-1) + { + /* pData is not a pointer if cbData is -1, so we linearize the address + * here rather than in the calling code. */ + pData = MapSL((SEGPTR)pData); + } return DdeClientTransaction(pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); } diff --git a/dlls/ddeml.dll16/ddeml.dll16.spec b/dlls/ddeml.dll16/ddeml.dll16.spec index 73fd461..ded7103 100644 --- a/dlls/ddeml.dll16/ddeml.dll16.spec +++ b/dlls/ddeml.dll16/ddeml.dll16.spec @@ -1,29 +1,29 @@ 2 pascal -ret16 DdeInitialize(ptr segptr long long) DdeInitialize16 3 pascal -ret16 DdeUninitialize(long) DdeUninitialize16 -4 pascal DdeConnectList(long long long word ptr) DdeConnectList16 +4 pascal DdeConnectList(long long long long ptr) DdeConnectList16 5 pascal DdeQueryNextServer(long long) DdeQueryNextServer16 6 pascal -ret16 DdeDisconnectList(long) DdeDisconnectList16 7 pascal DdeConnect(long long long ptr) DdeConnect16 8 pascal -ret16 DdeDisconnect(long) DdeDisconnect16 -9 pascal -ret16 DdeQueryConvInfo (long long ptr) DdeQueryConvInfo16 +9 pascal -ret16 DdeQueryConvInfo(long long ptr) DdeQueryConvInfo16 10 pascal -ret16 DdeSetUserHandle(long long long) DdeSetUserHandle16 -11 pascal DdeClientTransaction(ptr long long long s_word s_word long ptr) DdeClientTransaction16 +11 pascal DdeClientTransaction(long long long long word word long ptr) DdeClientTransaction16 12 pascal -ret16 DdeAbandonTransaction(long long long) DdeAbandonTransaction16 13 pascal -ret16 DdePostAdvise(long long long) DdePostAdvise16 14 pascal DdeCreateDataHandle(long ptr long long long word word) DdeCreateDataHandle16 -15 pascal DdeAddData(word ptr long long) DdeAddData16 -16 pascal DdeGetData(word ptr long long) DdeGetData16 -17 pascal DdeAccessData(word ptr) DdeAccessData16 -18 pascal -ret16 DdeUnaccessData(word) DdeUnaccessData16 +15 pascal DdeAddData(long ptr long long) DdeAddData16 +16 pascal DdeGetData(long ptr long long) DdeGetData16 +17 pascal DdeAccessData(long ptr) DdeAccessData16 +18 pascal -ret16 DdeUnaccessData(long) DdeUnaccessData16 19 pascal -ret16 DdeFreeDataHandle(long) DdeFreeDataHandle16 20 pascal -ret16 DdeGetLastError(long) DdeGetLastError16 21 pascal DdeCreateStringHandle(long str s_word) DdeCreateStringHandle16 22 pascal -ret16 DdeFreeStringHandle(long long) DdeFreeStringHandle16 -23 pascal DdeQueryString (long long ptr long word) DdeQueryString16 +23 pascal DdeQueryString(long long ptr long s_word) DdeQueryString16 24 pascal -ret16 DdeKeepStringHandle(long long) DdeKeepStringHandle16 26 pascal -ret16 DdeEnableCallback(long long word) DdeEnableCallback16 -27 pascal DdeNameService(long long long s_word) DdeNameService16 +27 pascal DdeNameService(long long long word) DdeNameService16 36 pascal -ret16 DdeCmpStringHandles(long long) DdeCmpStringHandles16 37 pascal DdeReconnect(long) DdeReconnect

1 0

Henri Verbeet : kernel32: Fix some memory leaks in set_wow64_environment().
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 5cd0ff14b9b12742ced6e14b3193ef7562c8790f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd0ff14b9b12742ced6e14b3… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 22 09:03:13 2010 +0100 kernel32: Fix some memory leaks in set_wow64_environment(). (cherry picked from commit 4c200a2050ff2ec1e70e9425583d46a26336e3e7) --- dlls/kernel32/process.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0538aa9..558294a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -604,9 +604,13 @@ static void set_wow64_environment(void) { if (is_win64 || is_wow64) SetEnvironmentVariableW( progw6432W, value ); if (is_win64 || !is_wow64) SetEnvironmentVariableW( progfilesW, value ); + HeapFree( GetProcessHeap(), 0, value ); } if (is_wow64 && (value = get_reg_value( hkey, progdir86W ))) + { SetEnvironmentVariableW( progfilesW, value ); + HeapFree( GetProcessHeap(), 0, value ); + } /* set the CommonProgramFiles variables */ @@ -614,9 +618,13 @@ static void set_wow64_environment(void) { if (is_win64 || is_wow64) SetEnvironmentVariableW( commonw6432W, value ); if (is_win64 || !is_wow64) SetEnvironmentVariableW( commonfilesW, value ); + HeapFree( GetProcessHeap(), 0, value ); } if (is_wow64 && (value = get_reg_value( hkey, commondir86W ))) + { SetEnvironmentVariableW( commonfilesW, value ); + HeapFree( GetProcessHeap(), 0, value ); + } NtClose( hkey ); }

1 0

Peter Schlaile : winedbg: Adds an rwatch command to winedbg.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: e235edcdad5768bd53ddf5b871be0a5e87b52b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e235edcdad5768bd53ddf5b87… Author: Peter Schlaile <peter(a)schlaile.de> Date: Sun Dec 5 17:35:55 2010 +0100 winedbg: Adds an rwatch command to winedbg. (cherry picked from commit 95a3cd8e30f72434a8ae3f71a97b5679937fdbf3) --- programs/winedbg/break.c | 8 ++++---- programs/winedbg/dbg.y | 9 ++++++--- programs/winedbg/debug.l | 1 + programs/winedbg/debugger.h | 4 ++-- programs/winedbg/info.c | 2 +- programs/winedbg/winedbg.man.in | 5 +++++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index b1cef6a..75969a5 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -415,14 +415,14 @@ static void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) * * Adds a watch point from an address (stored in a lvalue) */ -void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue) +void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue,BOOL is_write) { struct dbg_lvalue lval; types_extract_as_address(lvalue, &lval.addr); lval.type.id = dbg_itype_none; - break_add_watch(&lval, TRUE); + break_add_watch(&lval, is_write); } /*********************************************************************** @@ -430,14 +430,14 @@ void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue) * * Add a watchpoint from a symbol name */ -void break_add_watch_from_id(const char *name) +void break_add_watch_from_id(const char *name, BOOL is_write) { struct dbg_lvalue lvalue; switch (symbol_get_lvalue(name, -1, &lvalue, TRUE)) { case sglv_found: - break_add_watch(&lvalue, 1); + break_add_watch(&lvalue, is_write); break; case sglv_unknown: dbg_printf("Unable to add watchpoint\n"); diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 336f993..73188b9 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -52,7 +52,7 @@ static void parser(const char*); } %token tCONT tPASS tSTEP tLIST tNEXT tQUIT tHELP tBACKTRACE tALL tINFO tUP tDOWN -%token tENABLE tDISABLE tBREAK tHBREAK tWATCH tDELETE tSET tPRINT tEXAM +%token tENABLE tDISABLE tBREAK tHBREAK tWATCH tRWATCH tDELETE tSET tPRINT tEXAM %token tABORT tECHO %token tCLASS tMAPS tSTACK tSEGMENTS tSYMBOL tREGS tALLREGS tWND tLOCAL tEXCEPTION %token tPROCESS tTHREAD tEOL tEOF @@ -250,10 +250,13 @@ break_command: ; watch_command: - tWATCH '*' expr_lvalue { break_add_watch_from_lvalue(&$3); } - | tWATCH identifier { break_add_watch_from_id($2); } + tWATCH '*' expr_lvalue { break_add_watch_from_lvalue(&$3, TRUE); } + | tWATCH identifier { break_add_watch_from_id($2, TRUE); } + | tRWATCH '*' expr_lvalue { break_add_watch_from_lvalue(&$3, FALSE); } + | tRWATCH identifier { break_add_watch_from_id($2, FALSE); } ; + display_command: tDISPLAY { display_print(); } | tDISPLAY expr { display_add($2, 1, 0); } diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 2e87ddb..7ae77b2 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -203,6 +203,7 @@ STRING \"[^\n"]+\" <INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b { BEGIN(NOCMD); return tBREAK; } <INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { BEGIN(NOCMD); return tHBREAK; } <INITIAL>watch|watc|wat { BEGIN(NOCMD); return tWATCH; } +<INITIAL>rwatch|rwatc|rwat { BEGIN(NOCMD); return tRWATCH; } <INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } <INITIAL,NOPROCESS>run|ru|r { BEGIN(ASTRING_EXPECTED); return tRUN;} <INITIAL>detach|detac|deta|det { BEGIN(NOCMD); return tDETACH; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ae949f2..7492274 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -291,8 +291,8 @@ extern BOOL break_add_break(const ADDRESS64* addr, BOOL verbose, BOO extern BOOL break_add_break_from_lvalue(const struct dbg_lvalue* value, BOOL swbp); extern void break_add_break_from_id(const char* name, int lineno, BOOL swbp); extern void break_add_break_from_lineno(int lineno, BOOL swbp); -extern void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue); -extern void break_add_watch_from_id(const char* name); +extern void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue, BOOL is_write); +extern void break_add_watch_from_id(const char* name, BOOL is_write); extern void break_check_delayed_bp(void); extern void break_delete_xpoint(int num); extern void break_delete_xpoints_from_module(DWORD64 base); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index a09af5d..c0db6e6 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -48,7 +48,7 @@ void print_help(void) "subset of the commands that gdb accepts.", "The commands currently are:", " help quit", - " break [*<addr>] watch *<addr>", + " break [*<addr>] watch | rwatch *<addr>", " delete break bpnum disable bpnum", " enable bpnum condition <bpnum> [<expr>]", " finish cont [N]", diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index fb91d6b..44f9d19 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -185,6 +185,11 @@ Adds a watch command (on write) at address \fBN\fR (on 4 bytes). .IP \fBwatch\ <id>\fR Adds a watch command (on write) at the address of symbol \fB<id>\fR. Size depends on size of \fB<id>\fR. +.IP \fBrwatch\ *\ N\fR +Adds a watch command (on read) at address \fBN\fR (on 4 bytes). +.IP \fBrwatch\ <id>\fR +Adds a watch command (on read) at the address of symbol +\fB<id>\fR. Size depends on size of \fB<id>\fR. .IP \fBinfo\ break\fR Lists all (break|watch)-points (with their state). .PP

1 0

Marcus Meissner : wined3d: Detect nouveau as NVIDIA.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: acf0b329f84a21ed19eeff772ca1c9787ad4929e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf0b329f84a21ed19eeff772… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 29 10:28:21 2010 +0100 wined3d: Detect nouveau as NVIDIA. (cherry picked from commit 5d657bfdba3262d0b4af147fd4f660a104bbe52e) --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 81e7561..81f09c9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1233,7 +1233,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer) { - if (strstr(gl_vendor_string, "NVIDIA")) + if (strstr(gl_vendor_string, "NVIDIA") + || strstr(gl_vendor_string, "nouveau")) return HW_VENDOR_NVIDIA; if (strstr(gl_vendor_string, "ATI")

1 0