July 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Avoid an unnecessary strcpy().
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 7ec911adebf8294bc614dbc1287bd5c578690047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec911adebf8294bc614dbc12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:00 2009 +0200 wined3d: Avoid an unnecessary strcpy(). --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_gl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ff6bbe2..fecbc4f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -869,7 +869,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info, const char *gl_renderer) driver_version_table[i].lopart_lo); gl_info->driver_version_hipart = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, driver_version_table[i].hipart_lo); - strcpy(gl_info->driver_description, driver_version_table[i].description); + gl_info->driver_description = driver_version_table[i].description; break; } } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 794748d..ee15d35 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3954,7 +3954,7 @@ typedef struct _WineD3D_GL_Info { UINT vidmem; DWORD driver_version; DWORD driver_version_hipart; - CHAR driver_description[255]; + const char *driver_description; /** * CAPS Constants */

1 0

Henri Verbeet : wined3d: Add some missing float suffixes.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 2ac34bf2315a23e2ab00c0b76ceffdd1b6eea23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac34bf2315a23e2ab00c0b76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:01 2009 +0200 wined3d: Add some missing float suffixes. The compiler should be smart enough to fix most of these, but it looks sloppy. --- dlls/wined3d/arb_program_shader.c | 44 +++++++++++----------- dlls/wined3d/ati_fragment_shader.c | 8 ++-- dlls/wined3d/baseshader.c | 18 +++++----- dlls/wined3d/buffer.c | 4 +- dlls/wined3d/context.c | 4 +- dlls/wined3d/cubetexture.c | 10 +++--- dlls/wined3d/device.c | 68 ++++++++++++++++++++---------------- dlls/wined3d/directx.c | 22 ++++++------ dlls/wined3d/drawprim.c | 66 +++++++++++++++++----------------- dlls/wined3d/gl_compat.c | 18 +++++----- dlls/wined3d/glsl_shader.c | 18 +++++----- dlls/wined3d/state.c | 62 +++++++++++++++++---------------- dlls/wined3d/surface.c | 66 +++++++++++++++++------------------ dlls/wined3d/surface_base.c | 12 +++--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 20 +++++----- dlls/wined3d/utils.c | 4 +- dlls/wined3d/volumetexture.c | 8 ++-- dlls/wined3d/wined3d_private.h | 26 +++++++------- 19 files changed, 244 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ac34bf2315a23e2ab00c…

1 0

Vladimir Pankratov : regedit: Implement open last key at startup.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 5ce04f7ffc0db236d229fbe46d4d42bbf572506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce04f7ffc0db236d229fbe46… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 2 21:29:44 2009 +0500 regedit: Implement open last key at startup. --- programs/regedit/childwnd.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 74c8b66..a7e4666 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -24,6 +24,7 @@ #include <stdio.h> #include "main.h" +#include "regproc.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -33,6 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; static int last_split; +static const WCHAR wszLastKey[] = {'L','a','s','t','K','e','y',0}; +static const WCHAR wszKeyName[] = {'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','\\', + 'A','p','p','l','e','t','s','\\','R','e','g','e','d','i','t',0}; + /******************************************************************************* * Local module support methods */ @@ -222,6 +230,47 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } /******************************************************************************* + * get_last_key [internal] + * + * open last key + * + */ +static void get_last_key(HWND hwndTV) +{ + HKEY hkey; + WCHAR wszVal[KEY_MAX_LEN]; + DWORD dwSize = sizeof(wszVal); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) + { + if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS) + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)FindPathInTree(hwndTV, wszVal)); + + RegCloseKey(hkey); + } +} + +/******************************************************************************* + * set_last_key [internal] + * + * save last key + * + */ +static void set_last_key(HWND hwndTV) +{ + HKEY hkey; + WCHAR *wszVal; + + if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) + { + wszVal = GetItemFullPath(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), FALSE); + RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)wszVal, KEY_MAX_LEN * sizeof(WCHAR)); + HeapFree(GetProcessHeap(), 0, wszVal); + RegCloseKey(hkey); + } +} + +/******************************************************************************* * * FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG) * @@ -245,6 +294,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa g_pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, g_pChildWnd->szPath*/); g_pChildWnd->nFocusPanel = 1; SetFocus(g_pChildWnd->hTreeWnd); + get_last_key(g_pChildWnd->hTreeWnd); break; case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) { @@ -266,6 +316,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa } goto def; case WM_DESTROY: + set_last_key(g_pChildWnd->hTreeWnd); HeapFree(GetProcessHeap(), 0, g_pChildWnd); g_pChildWnd = NULL; PostQuitMessage(0);

1 0

Alexandre Julliard : server: Return the process CPU in the get_process_info request.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 6056e8a52b8a931bc54306044fb991028fa7f1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6056e8a52b8a931bc54306044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:37:47 2009 +0200 server: Return the process CPU in the get_process_info request. --- include/wine/server_protocol.h | 4 +++- server/process.c | 1 + server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f819686..c7566ea 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -693,6 +693,8 @@ struct get_process_info_reply timeout_t end_time; int exit_code; int priority; + cpu_type_t cpu; + char __pad_60[4]; }; @@ -5310,6 +5312,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 386 +#define SERVER_PROTOCOL_VERSION 387 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 8a4fb15..2b8d8f6 100644 --- a/server/process.c +++ b/server/process.c @@ -1068,6 +1068,7 @@ DECL_HANDLER(get_process_info) reply->peb = process->peb; reply->start_time = process->start_time; reply->end_time = process->end_time; + reply->cpu = process->cpu; release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 8ae653b..e871736 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -660,6 +660,7 @@ typedef union timeout_t end_time; /* process end time */ int exit_code; /* process exit code */ int priority; /* priority class */ + cpu_type_t cpu; /* CPU that this process is running on */ @END diff --git a/server/request.h b/server/request.h index f85756c..4fc3bd6 100644 --- a/server/request.h +++ b/server/request.h @@ -694,7 +694,8 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, start_time) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); -C_ASSERT( sizeof(struct get_process_info_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); +C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, priority) == 20 ); diff --git a/server/trace.c b/server/trace.c index 6781ef7..d24f653 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1152,6 +1152,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_timeout( ", end_time=", &req->end_time ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); + dump_cpu_type( ", cpu=", &req->cpu ); } static void dump_set_process_info_request( const struct set_process_info_request *req )

1 0

Alexandre Julliard : ntdll: Support querying the Wow64 state of other processes.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 12c90b04dc3b95f5b15d4d64cd3ebaa1374f2f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c90b04dc3b95f5b15d4d64c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:38:19 2009 +0200 ntdll: Support querying the Wow64 state of other processes. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/process.c | 14 +++++++++++++- dlls/ntdll/server.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3032553..ea2234a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,6 +71,7 @@ extern void virtual_init_threading(void); /* server support */ extern timeout_t server_start_time; +extern unsigned int server_cpus; extern int is_wow64; extern void server_init_process(void); extern NTSTATUS server_init_process_done(void); diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 9ec5513..6258569 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -307,7 +307,19 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessWow64Information: if (ProcessInformationLength == sizeof(DWORD)) { - *(DWORD *)ProcessInformation = is_wow64; + DWORD val = 0; + + if (ProcessHandle == GetCurrentProcess()) val = is_wow64; + else if (server_cpus & (1 << CPU_x86_64)) + { + SERVER_START_REQ( get_process_info ) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + if (!(ret = wine_server_call( req ))) val = (reply->cpu != CPU_x86_64); + } + SERVER_END_REQ; + } + *(DWORD *)ProcessInformation = val; len = sizeof(DWORD); } else ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a4f2953..1eea402 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -94,7 +94,7 @@ static const enum cpu_type client_cpu = CPU_SPARC; #error Unsupported CPU #endif -static unsigned int server_cpus; +unsigned int server_cpus = 0; int is_wow64 = FALSE; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS

1 0

Alexandre Julliard : kernel32: Add implementation of GetSystemWow64DirectoryA/W.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 03d6da0894b3a3f9c3b37b36b2c70d7c2a4ce831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d6da0894b3a3f9c3b37b36b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:42:03 2009 +0200 kernel32: Add implementation of GetSystemWow64DirectoryA/W. --- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/path.c | 28 ++++++++++++++++++++++------ dlls/kernel32/process.c | 15 +++++++++++++++ include/winbase.h | 3 +++ 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index b23aedf..39a5e23 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -71,6 +71,7 @@ extern HANDLE dos_handles[DOS_TABLE_SIZE]; extern const WCHAR *DIR_Windows; extern const WCHAR *DIR_System; +extern const WCHAR *DIR_SysWow64; extern VOID SYSLEVEL_CheckNotLevel( INT level ); diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 0b3a87e..299db1c 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1521,10 +1521,22 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) * - On Win32 we should returns ERROR_CALL_NOT_IMPLEMENTED * - On Win64 we should returns the SysWow64 (system64) directory */ -UINT WINAPI GetSystemWow64DirectoryW( LPWSTR lpBuffer, UINT uSize ) +UINT WINAPI GetSystemWow64DirectoryW( LPWSTR path, UINT count ) { - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + UINT len; + + if (!DIR_SysWow64) + { + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; + } + len = strlenW( DIR_SysWow64 ) + 1; + if (path && count >= len) + { + strcpyW( path, DIR_SysWow64 ); + len--; + } + return len; } @@ -1533,10 +1545,14 @@ UINT WINAPI GetSystemWow64DirectoryW( LPWSTR lpBuffer, UINT uSize ) * * See comment for GetWindowsWow64DirectoryW. */ -UINT WINAPI GetSystemWow64DirectoryA( LPSTR lpBuffer, UINT uSize ) +UINT WINAPI GetSystemWow64DirectoryA( LPSTR path, UINT count ) { - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + if (!DIR_SysWow64) + { + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; + } + return copy_filename_WtoA( DIR_SysWow64, path, count ); } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6fde35b..4e74782 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -76,11 +76,13 @@ static UINT process_error_mode; static DWORD shutdown_flags = 0; static DWORD shutdown_priority = 0x280; static DWORD process_dword; +static BOOL is_wow64; HMODULE kernel32_handle = 0; const WCHAR *DIR_Windows = NULL; const WCHAR *DIR_System = NULL; +const WCHAR *DIR_SysWow64 = NULL; /* Process flags */ #define PDB32_DEBUGGED 0x0001 /* Process is being debugged */ @@ -822,6 +824,7 @@ static void init_windows_dirs(void) static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; static const WCHAR default_sysdirW[] = {'\\','s','y','s','t','e','m','3','2',0}; + static const WCHAR default_syswow64W[] = {'\\','s','y','s','w','o','w','6','4',0}; DWORD len; WCHAR *buffer; @@ -849,6 +852,17 @@ static void init_windows_dirs(void) DIR_System = buffer; } +#ifndef _WIN64 /* SysWow64 is always defined on 64-bit */ + if (is_wow64) +#endif + { + len = strlenW( DIR_Windows ); + buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(default_syswow64W) ); + memcpy( buffer, DIR_Windows, len * sizeof(WCHAR) ); + memcpy( buffer + len, default_syswow64W, sizeof(default_syswow64W) ); + DIR_SysWow64 = buffer; + } + if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) ERR( "directory %s could not be created, error %u\n", debugstr_w(DIR_Windows), GetLastError() ); @@ -1010,6 +1024,7 @@ void CDECL __wine_kernel_init(void) setbuf(stdout,NULL); setbuf(stderr,NULL); kernel32_handle = GetModuleHandleW(kernel32W); + IsWow64Process( GetCurrentProcess(), &is_wow64 ); LOCALE_Init(); diff --git a/include/winbase.h b/include/winbase.h index a7eaf9d..d7d8773 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1726,6 +1726,9 @@ WINBASEAPI VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME); WINBASEAPI UINT WINAPI GetSystemWindowsDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetSystemWindowsDirectoryW(LPWSTR,UINT); #define GetSystemWindowsDirectory WINELIB_NAME_AW(GetSystemWindowsDirectory) +WINBASEAPI UINT WINAPI GetSystemWow64DirectoryA(LPSTR,UINT); +WINBASEAPI UINT WINAPI GetSystemWow64DirectoryW(LPWSTR,UINT); +#define GetSystemWow64Directory WINELIB_NAME_AW(GetSystemWow64Directory) WINBASEAPI DWORD WINAPI GetTapeParameters(HANDLE,DWORD,LPDWORD,LPVOID); WINBASEAPI DWORD WINAPI GetTapePosition(HANDLE,DWORD,LPDWORD,LPDWORD,LPDWORD); WINBASEAPI DWORD WINAPI GetTapeStatus(HANDLE);

1 0

Alexandre Julliard : shell32: Add support for the CSIDL_SYSTEMX86 folder.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 43e90c8ff74b89c45351f2efe43f3793f8a84098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e90c8ff74b89c45351f2efe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:47:58 2009 +0200 shell32: Add support for the CSIDL_SYSTEMX86 folder. --- dlls/shell32/shellpath.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2434e9a..44f0750 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -812,6 +812,7 @@ typedef enum _CSIDL_Type { CSIDL_Type_NonExistent, CSIDL_Type_WindowsPath, CSIDL_Type_SystemPath, + CSIDL_Type_SystemX86Path, } CSIDL_Type; typedef struct @@ -1029,7 +1030,7 @@ static const CSIDL_DATA CSIDL_Data[] = NULL }, { /* 0x29 - CSIDL_SYSTEMX86 */ - CSIDL_Type_NonExistent, + CSIDL_Type_SystemX86Path, NULL, NULL }, @@ -1782,6 +1783,17 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( } hr = S_OK; break; + case CSIDL_Type_SystemX86Path: + if (!GetSystemWow64DirectoryW(szTemp, MAX_PATH)) GetSystemDirectoryW(szTemp, MAX_PATH); + if (CSIDL_Data[folder].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath) && + *CSIDL_Data[folder].szDefaultPath) + { + PathAddBackslashW(szTemp); + strcatW(szTemp, CSIDL_Data[folder].szDefaultPath); + } + hr = S_OK; + break; case CSIDL_Type_CurrVer: hr = _SHGetCurrentVersionPath(dwFlags, folder, szTemp); break;

1 0

Alexandre Julliard : shell32/tests: Revive the test for CSIDL_SYSTEMX86.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 7af70c2c9736883348c7a490d9e18beb131fe6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af70c2c9736883348c7a490d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 11:48:25 2009 +0200 shell32/tests: Revive the test for CSIDL_SYSTEMX86. --- dlls/shell32/tests/shellpath.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4cacb08..b5b1967 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -89,6 +89,7 @@ static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); static HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *); +static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; @@ -684,10 +685,17 @@ static void testSystemDir(void) "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", systemDir, systemShellPath); } - /* CSIDL_SYSTEMX86 isn't checked in the same way, since it's different - * on Win64 (and non-x86 Windows systems, if there are any still in - * existence) than on Win32. - */ + + if (!pGetSystemWow64DirectoryA || !pGetSystemWow64DirectoryA(systemDir, sizeof(systemDir))) + GetSystemDirectoryA(systemDir, sizeof(systemDir)); + myPathRemoveBackslashA(systemDir); + if (pSHGetSpecialFolderPathA(NULL, systemShellPath, CSIDL_SYSTEMX86, FALSE)) + { + myPathRemoveBackslashA(systemShellPath); + ok(!lstrcmpiA(systemDir, systemShellPath), + "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", + systemDir, systemShellPath); + } } /* Globals used by subprocesses */ @@ -871,6 +879,8 @@ START_TEST(shellpath) if (!init()) return; loadShell32(); + pGetSystemWow64DirectoryA = (void *)GetProcAddress( GetModuleHandleA("kernel32.dll"), + "GetSystemWow64DirectoryA" ); if (myARGC >= 3) doChild(myARGV[2]);

1 0

Nikolay Sivov : comctl32/listview: More LVM_*HITTEST tests.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: faebaa575bbc8daff287c39bd7fbff96a0b47d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faebaa575bbc8daff287c39bd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 7 02:50:15 2009 +0400 comctl32/listview: More LVM_*HITTEST tests. --- dlls/comctl32/tests/listview.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 43a7037..98c31c4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2661,11 +2661,17 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); /* outside possible client rectangle (to right) */ x = pos.x + 500; y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); /* subitem returned with -1 item too */ x = pos.x + 150; y = -10; @@ -2676,22 +2682,33 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_NOWHERE, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_NOWHERE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); /* the same with LVS_EX_FULLROWSELECT */ SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEM, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); MoveWindow(hwnd, 0, 0, 100, 100, FALSE); x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); /* outside possible client rectangle (to right) */ x = pos.x + 500; y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); @@ -2718,6 +2735,8 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, TRUE, FALSE, FALSE, __LINE__); /* state icons indices are 1 based, check with valid index */ item.mask = LVIF_STATE; @@ -2732,6 +2751,8 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, TRUE, FALSE, FALSE, __LINE__); himl2 = (HIMAGELIST)SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); ok(himl2 == himl, "should return handle\n"); @@ -2743,6 +2764,8 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__); + y = (bounds.bottom - bounds.top) / 2; + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, TRUE, FALSE, TRUE, __LINE__); DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Fix hittesting for "small" positive Y coordinates.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 86e4d1cdbe2bd0cff9474415caddb4b9491d0518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e4d1cdbe2bd0cff9474415c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 7 03:28:53 2009 +0400 comctl32/listview: Fix hittesting for "small" positive Y coordinates. --- dlls/comctl32/listview.c | 28 +++++++++++++++++++++------- dlls/comctl32/tests/listview.c | 18 +++++++++--------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2a66152..24da77d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6814,6 +6814,16 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, /* LVM_SUBITEMHITTEST checks left bound of possible client area */ if (infoPtr->rcList.left > lpht->pt.x && Origin.x < lpht->pt.x) lpht->flags |= LVHT_TOLEFT; + + if (lpht->pt.y < infoPtr->rcList.top && lpht->pt.y >= 0) + opt.y = lpht->pt.y + infoPtr->rcList.top; + else + opt.y = lpht->pt.y; + + if (infoPtr->rcList.top > opt.y) + lpht->flags |= LVHT_ABOVE; + else if (infoPtr->rcList.bottom < opt.y) + lpht->flags |= LVHT_BELOW; } else { @@ -6821,12 +6831,12 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->flags |= LVHT_TOLEFT; else if (infoPtr->rcList.right < lpht->pt.x) lpht->flags |= LVHT_TORIGHT; + + if (infoPtr->rcList.top > lpht->pt.y) + lpht->flags |= LVHT_ABOVE; + else if (infoPtr->rcList.bottom < lpht->pt.y) + lpht->flags |= LVHT_BELOW; } - - if (infoPtr->rcList.top > lpht->pt.y) - lpht->flags |= LVHT_ABOVE; - else if (infoPtr->rcList.bottom < lpht->pt.y) - lpht->flags |= LVHT_BELOW; /* even if item is invalid try to find subitem */ if (infoPtr->uView == LV_VIEW_DETAILS && subitem) @@ -6883,8 +6893,12 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, NULL, &rcIcon, &rcState, &rcLabel); LISTVIEW_GetItemOrigin(infoPtr, iItem, &Position); opt.x = lpht->pt.x - Position.x - Origin.x; - opt.y = lpht->pt.y - Position.y - Origin.y; - + + if (lpht->pt.y < infoPtr->rcList.top && lpht->pt.y >= 0) + opt.y = lpht->pt.y - Position.y - Origin.y + infoPtr->rcList.top; + else + opt.y = lpht->pt.y - Position.y - Origin.y; + if (infoPtr->uView == LV_VIEW_DETAILS) { rcBounds = rcBox; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 98c31c4..fd0e55c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2663,7 +2663,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); /* outside possible client rectangle (to right) */ x = pos.x + 500; y = pos.y + (bounds.bottom - bounds.top) / 2; @@ -2671,7 +2671,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* subitem returned with -1 item too */ x = pos.x + 150; y = -10; @@ -2684,7 +2684,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_NOWHERE, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); /* the same with LVS_EX_FULLROWSELECT */ SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); x = pos.x + 150; /* outside column */ @@ -2692,7 +2692,7 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEM, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); MoveWindow(hwnd, 0, 0, 100, 100, FALSE); x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; @@ -2700,7 +2700,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); /* outside possible client rectangle (to right) */ x = pos.x + 500; y = pos.y + (bounds.bottom - bounds.top) / 2; @@ -2708,7 +2708,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); @@ -2736,7 +2736,7 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; - test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, TRUE, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); /* state icons indices are 1 based, check with valid index */ item.mask = LVIF_STATE; @@ -2752,7 +2752,7 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; - test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, TRUE, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); himl2 = (HIMAGELIST)SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); ok(himl2 == himl, "should return handle\n"); @@ -2765,7 +2765,7 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__); y = (bounds.bottom - bounds.top) / 2; - test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, TRUE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__); DestroyWindow(hwnd); }

1 0