September 2012 - Wine-commits

Piotr Caban : ntdll: Added processor cache to SystemLogicalProcessorInformation (Mac).
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 682b276ac58b185d567c1026cbf1cbb9addc37b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682b276ac58b185d567c1026c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 5 12:01:28 2012 +0200 ntdll: Added processor cache to SystemLogicalProcessorInformation (Mac). --- dlls/ntdll/nt.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6f2635d..2536d33 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1609,10 +1609,12 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** #elif defined(__APPLE__) static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) { - DWORD len = 0, i, j; - DWORD cores_no, lcpu_no, lcpu_per_core, cores_per_package; + DWORD len = 0, i, j, k; + DWORD cores_no, lcpu_no, lcpu_per_core, cores_per_package, assoc; size_t size; ULONG_PTR mask; + LONGLONG cache_size, cache_line_size, cache_sharing[10]; + CACHE_DESCRIPTOR cache[4]; lcpu_no = NtCurrentTeb()->Peb->NumberOfProcessors; @@ -1648,6 +1650,71 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** len++; } + memset(cache, 0, sizeof(cache)); + cache[0].Level = 1; + cache[0].Type = CacheInstruction; + cache[1].Level = 1; + cache[1].Type = CacheData; + cache[2].Level = 2; + cache[2].Type = CacheUnified; + cache[3].Level = 3; + cache[3].Type = CacheUnified; + + size = sizeof(cache_line_size); + if(!sysctlbyname("hw.cachelinesize", &cache_line_size, &size, NULL, 0)) + { + for(i=0; i<4; i++) + cache[i].LineSize = cache_line_size; + } + + /* TODO: set associativity for all caches */ + size = sizeof(assoc); + if(!sysctlbyname("machdep.cpu.cache.L2_associativity", &assoc, &size, NULL, 0)) + cache[2].Associativity = assoc; + + size = sizeof(cache_size); + if(!sysctlbyname("hw.l1icachesize", &cache_size, &size, NULL, 0)) + cache[0].Size = cache_size; + size = sizeof(cache_size); + if(!sysctlbyname("hw.l1dcachesize", &cache_size, &size, NULL, 0)) + cache[1].Size = cache_size; + size = sizeof(cache_size); + if(!sysctlbyname("hw.l2cachesize", &cache_size, &size, NULL, 0)) + cache[2].Size = cache_size; + size = sizeof(cache_size); + if(!sysctlbyname("hw.l3cachesize", &cache_size, &size, NULL, 0)) + cache[3].Size = cache_size; + + size = sizeof(cache_sharing); + if(!sysctlbyname("hw.cacheconfig", cache_sharing, &size, NULL, 0)) + { + for(i=1; i<4 && i<size/sizeof(*cache_sharing); i++) + { + if(!cache_sharing[i] || !cache[i].Size) + continue; + + for(j=0; j<lcpu_no/cache_sharing[i]; j++) + { + mask = 0; + for(k=j*cache_sharing[i]; k<lcpu_no && k<(j+1)*cache_sharing[i]; k++) + mask |= (ULONG_PTR)1<<k; + + if(i==1 && cache[0].Size) + { + (*data)[len].Relationship = RelationCache; + (*data)[len].ProcessorMask = mask; + (*data)[len].u.Cache = cache[0]; + len++; + } + + (*data)[len].Relationship = RelationCache; + (*data)[len].ProcessorMask = mask; + (*data)[len].u.Cache = cache[i]; + len++; + } + } + } + mask = 0; for(i=0; i<lcpu_no; i++) mask |= (ULONG_PTR)1<<i;

1 0

Jason Edmeades : cmd: Fix "PATH=value" command.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 4f71f4af59b8989b2288800a7b337f61475df505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f71f4af59b8989b2288800a7… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 4 00:30:17 2012 +0100 cmd: Fix "PATH=value" command. --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 16f4eff..b2546d4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2371,7 +2371,7 @@ void WCMD_setshow_path (const WCHAR *command) { static const WCHAR pathW[] = {'P','A','T','H','\0'}; static const WCHAR pathEqW[] = {'P','A','T','H','=','\0'}; - if (strlenW(param1) == 0) { + if (strlenW(param1) == 0 && strlenW(param2) == 0) { status = GetEnvironmentVariableW(pathW, string, sizeof(string)/sizeof(WCHAR)); if (status != 0) { WCMD_output_asis ( pathEqW); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 13b53c5..093cc23 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1530,6 +1530,17 @@ if d==d goto dest4 :dest4(a)space@ echo goto with a following space worked +echo ------------ Testing PATH ------------ +set backup_path=%path% +set path=original +path +path try2 +path +path=try3 +path +set path=%backup_path% +set backup_path= + echo ------------ Testing combined CALLs/GOTOs ------------ echo @echo off>foo.cmd echo goto :eof>>foot.cmd diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b7bcd96..93b11e5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -825,6 +825,10 @@ goto with no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked +------------ Testing PATH ------------ +PATH=original +PATH=try2 +PATH=try3 ------------ Testing combined CALLs/GOTOs ------------ world cheball

1 0

Jason Edmeades : cmd: More generic zero iteration for loop fix.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 141e33b845bff271fd8aebdd8ec24b32a95be454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=141e33b845bff271fd8aebdd8… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 4 21:11:51 2012 +0100 cmd: More generic zero iteration for loop fix. --- programs/cmd/builtins.c | 23 +++++++++++++++++------ programs/cmd/tests/test_builtins.cmd | 24 +++++++++++++++++++++--- programs/cmd/tests/test_builtins.cmd.exp | 9 ++++++--- 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b2546d4..4ce78f7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1084,6 +1084,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { BOOL expandDirs = FALSE; BOOL useNumbers = FALSE; BOOL doFileset = FALSE; + BOOL doExecuted = FALSE; /* Has the 'do' part been executed */ LONG numbers[3] = {0,0,0}; /* Defaults to 0 in native */ int itemNum; CMD_LIST *thisCmdStart; @@ -1233,6 +1234,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { { thisCmdStart = cmdStart; WINE_TRACE("Processing FOR filename %s\n", wine_dbgstr_w(fd.cFileName)); + doExecuted = TRUE; WCMD_part_execute (&thisCmdStart, firstCmd, variable, fd.cFileName, FALSE, TRUE); } @@ -1241,6 +1243,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { FindClose (hff); } } else { + doExecuted = TRUE; WCMD_part_execute(&thisCmdStart, firstCmd, variable, item, FALSE, TRUE); } @@ -1310,6 +1313,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* FIXME: The following should be moved into its own routine and reused for the string literal parsing below */ thisCmdStart = cmdStart; + doExecuted = TRUE; WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); cmdEnd = thisCmdStart; } @@ -1340,6 +1344,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* FIXME: The following should be moved into its own routine and reused for the string literal parsing below */ thisCmdStart = cmdStart; + doExecuted = TRUE; WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); cmdEnd = thisCmdStart; } @@ -1369,17 +1374,23 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("Processing FOR number %s\n", wine_dbgstr_w(thisNum)); thisCmdStart = cmdStart; + doExecuted = TRUE; WCMD_part_execute(&thisCmdStart, firstCmd, variable, thisNum, FALSE, TRUE); } - - /* Now skip over the subsequent commands if we did not perform the for loop */ - if (thisCmdStart == cmdStart) { - WINE_TRACE("Skipping for loop commands due to no valid iterations\n"); - WCMD_part_execute(&thisCmdStart, firstCmd, variable, thisNum, FALSE, FALSE); - } cmdEnd = thisCmdStart; } + /* Now skip over the do part if we did not perform the for loop so far. + We store in cmdEnd the next command after the do block, but we only + know this if something was run. If it has not been, we need to calculate + it. */ + if (!doExecuted) { + thisCmdStart = cmdStart; + WINE_TRACE("Skipping for loop commands due to no valid iterations\n"); + WCMD_part_execute(&thisCmdStart, firstCmd, NULL, NULL, FALSE, FALSE); + cmdEnd = thisCmdStart; + } + /* When the loop ends, either something like a GOTO or EXIT /b has terminated all processing, OR it should be pointing to the end of && processing OR it should be pointing at the NULL end of bracket for the DO. The return diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 093cc23..77086ed 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -643,9 +643,27 @@ echo > bazbaz echo --- basic wildcards for %%i in (ba*) do echo %%i echo --- for /d -for /d %%i in (baz foo bar) do echo %%i -rem FIXME for /d incorrectly parses when wildcards are used -rem for /d %%i in (bazb*) do echo %%i +for /d %%i in (baz foo bar) do echo %%i 2>&1 +rem Confirm we dont match files: +for /d %%i in (bazb*) do echo %%i 2>&1 +for /d %%i in (bazb2*) do echo %%i 2>&1 +rem Show we pass through non wildcards +for /d %%i in (PASSED) do echo %%i +for /d %%i in (xxx) do ( + echo %%i - Should be xxx + echo Expected second line +) +rem Show we issue no messages on failures +for /d %%i in (FAILED?) do echo %%i 2>&1 +for /d %%i in (FAILED?) do ( + echo %%i - Unexpected! + echo FAILED Unexpected second line +) +for /d %%i in (FAILED*) do echo %%i 2>&1 +for /d %%i in (FAILED*) do ( + echo %%i - Unexpected! + echo FAILED Unexpected second line +) rem FIXME can't test wildcard expansion here since it's listed in directory rem order, and not in alphabetic order. rem Proper testing would need a currently missing "sort" program implementation. diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 93b11e5..fe4c30c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -455,9 +455,12 @@ C --- basic wildcards bazbaz --- for /d -baz -foo -bar +baz(a)space@ +foo(a)space@ +bar(a)space@ +PASSED +xxx - Should be xxx +Expected second line --- for /L 1 3

1 0

Jason Edmeades : cmd: Fix incorrect pointer comparison.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 9877b53b8cd070dd92d3a4d16b39343a7283b65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9877b53b8cd070dd92d3a4d16… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 4 23:40:43 2012 +0100 cmd: Fix incorrect pointer comparison. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4ce78f7..b2f9aeb 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2131,7 +2131,7 @@ void WCMD_setshow_default (const WCHAR *command) { if (*command != '"') *pos++ = *command; command++; } - while (pos > command && (*(pos-1) == ' ' || *(pos-1) == '\t')) + while (pos > string && (*(pos-1) == ' ' || *(pos-1) == '\t')) pos--; *pos = 0x00;

1 0

Alexandre Julliard : user32: Add a helper function to retrieve the virtual screen rectangle.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 75b641fc75727138cab2230453ea0b859bf5437c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b641fc75727138cab223045… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 5 19:28:50 2012 +0200 user32: Add a helper function to retrieve the virtual screen rectangle. --- dlls/user32/sysparams.c | 26 ++++++++++++++------------ dlls/user32/user_private.h | 1 + dlls/user32/winpos.c | 6 +----- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4603cf4..b27b506 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -523,6 +523,12 @@ static void get_monitors_info( struct monitor_info *info ) EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info ); } +RECT get_virtual_screen_rect(void) +{ + struct monitor_info info; + get_monitors_info( &info ); + return info.virtual_rect; +} /* get text metrics and/or "average" char width of the specified logfont * for the specified dc */ @@ -2856,27 +2862,23 @@ INT WINAPI GetSystemMetrics( INT index ) return 1; case SM_XVIRTUALSCREEN: { - struct monitor_info info; - get_monitors_info( &info ); - return info.virtual_rect.left; + RECT rect = get_virtual_screen_rect(); + return rect.left; } case SM_YVIRTUALSCREEN: { - struct monitor_info info; - get_monitors_info( &info ); - return info.virtual_rect.top; + RECT rect = get_virtual_screen_rect(); + return rect.top; } case SM_CXVIRTUALSCREEN: { - struct monitor_info info; - get_monitors_info( &info ); - return info.virtual_rect.right - info.virtual_rect.left; + RECT rect = get_virtual_screen_rect(); + return rect.right - rect.left; } case SM_CYVIRTUALSCREEN: { - struct monitor_info info; - get_monitors_info( &info ); - return info.virtual_rect.bottom - info.virtual_rect.top; + RECT rect = get_virtual_screen_rect(); + return rect.bottom - rect.top; } case SM_CMONITORS: { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 2bd8ad8..a57751f 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -214,6 +214,7 @@ extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module ) DECLSPEC_HIDDEN; +extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 507a5ce..27489fe 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2544,11 +2544,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else { parent = 0; - GetClientRect( GetDesktopWindow(), &mouseRect ); - mouseRect.left = GetSystemMetrics( SM_XVIRTUALSCREEN ); - mouseRect.top = GetSystemMetrics( SM_YVIRTUALSCREEN ); - mouseRect.right = mouseRect.left + GetSystemMetrics( SM_CXVIRTUALSCREEN ); - mouseRect.bottom = mouseRect.top + GetSystemMetrics( SM_CYVIRTUALSCREEN ); + mouseRect = get_virtual_screen_rect(); } if (ON_LEFT_BORDER(hittest))

1 0

Alexandre Julliard : gdi32: Let user32 specify the device rectangle when setting the visible region.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 01c9c1cbc246ea7b4a8fdcd9773485404e3c2eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c9c1cbc246ea7b4a8fdcd97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 5 19:29:29 2012 +0200 gdi32: Let user32 specify the device rectangle when setting the visible region. --- dlls/gdi32/clipping.c | 9 +++++---- dlls/gdi32/gdi32.spec | 2 +- dlls/user32/painting.c | 3 ++- include/wine/gdi_driver.h | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 1cb420c..3486a18 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -268,13 +268,13 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) /*********************************************************************** * __wine_set_visible_region (GDI32.@) */ -void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) +void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect ) { DC * dc; if (!(dc = get_dc_ptr( hdc ))) return; - TRACE( "%p %p %s\n", hdc, hrgn, wine_dbgstr_rect(vis_rect) ); + TRACE( "%p %p %s %s\n", hdc, hrgn, wine_dbgstr_rect(vis_rect), wine_dbgstr_rect(device_rect) ); /* map region to DC coordinates */ OffsetRgn( hrgn, -vis_rect->left, -vis_rect->top ); @@ -282,6 +282,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); dc->dirty = 0; dc->vis_rect = *vis_rect; + dc->device_rect = *device_rect; dc->hVisRgn = hrgn; DC_UpdateXforms( dc ); update_dc_clipping( dc ); @@ -415,8 +416,6 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) if (get_dc_region( dc )) { ret = GetRgnBox( get_dc_region( dc ), rect ); - if (get_dc_device_rect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) - ret = NULLREGION; } else { @@ -424,6 +423,8 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) *rect = dc->vis_rect; } + if (get_dc_device_rect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) ret = NULLREGION; + if (dc->layout & LAYOUT_RTL) { int tmp = rect->left; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 1e30485..dfb8732 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -511,7 +511,7 @@ # GDI objects @ cdecl __wine_make_gdi_object_system(long long) -@ cdecl __wine_set_visible_region(long long ptr) +@ cdecl __wine_set_visible_region(long long ptr ptr) # OpenGL @ cdecl __wine_get_wgl_driver(long long) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 64f4318..d6b5aaf 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -161,7 +161,8 @@ static void update_visible_region( struct dce *dce ) if (dce->clip_rgn) CombineRgn( vis_rgn, vis_rgn, dce->clip_rgn, (flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF ); - __wine_set_visible_region( dce->hdc, vis_rgn, &win_rect ); + top_rect = get_virtual_screen_rect(); + __wine_set_visible_region( dce->hdc, vis_rgn, &win_rect, &top_rect ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 2f31628..6605c67 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -236,7 +236,8 @@ WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); -extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); +extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, + const RECT *device_rect ); extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Piotr Caban : msvcrt: Moved RTTI and thiscall related macros to separate header.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 63be52e2aa0031987d43bc77c83f90cda149a5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63be52e2aa0031987d43bc77c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 5 14:35:17 2012 +0200 msvcrt: Moved RTTI and thiscall related macros to separate header. --- dlls/msvcrt/cpp.c | 153 +++++++--------------------------------------------- dlls/msvcrt/cxx.h | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63be52e2aa0031987d43b…

1 0

Piotr Caban : msvcrt: Support 64-bit RTTI in __RTtypeid function.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: fbae5a95c3bf64400cfae2bc29a905dca022fe70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbae5a95c3bf64400cfae2bc2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 5 14:35:42 2012 +0200 msvcrt: Support 64-bit RTTI in __RTtypeid function. --- dlls/msvcrt/cpp.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/cpp.c | 58 ++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3fa526e..b1512f5 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -39,6 +39,42 @@ typedef exception bad_cast; typedef exception bad_typeid; typedef exception __non_rtti_object; +#ifdef __x86_64__ + +/* x86_64 RTTI structures */ +typedef struct +{ + unsigned int type_descriptor; + int num_base_classes; + this_ptr_offsets offsets; + unsigned int attributes; +} rtti_base_descriptor_x64; + +typedef struct +{ + unsigned bases[3]; +} rtti_base_array_x64; + +typedef struct +{ + unsigned int signature; + unsigned int attributes; + int array_len; + unsigned int base_classes; +} rtti_object_hierarchy_x64; + +typedef struct +{ + unsigned int signature; + int base_class_offset; + unsigned int flags; + unsigned int type_descriptor; + unsigned int type_hierarchy; + unsigned int object_locator; /* not present if signature == 0 */ +} rtti_object_locator_x64; + +#endif + extern const vtable_ptr MSVCRT_exception_vtable; extern const vtable_ptr MSVCRT_bad_typeid_vtable; extern const vtable_ptr MSVCRT_bad_cast_vtable; @@ -794,6 +830,7 @@ void CDECL MSVCRT_unexpected(void) * This function is usually called by compiler generated code as a result * of using one of the C++ dynamic cast statements. */ +#ifndef __x86_64__ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) { const type_info *ret; @@ -822,6 +859,44 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) return ret; } +#else + +const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) +{ + const type_info *ret; + + if (!cppobj) + { + bad_typeid e; + MSVCRT_bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" ); + _CxxThrowException( &e, &bad_typeid_exception_type ); + return NULL; + } + + __TRY + { + const rtti_object_locator *obj_locator = (rtti_object_locator*)get_obj_locator( cppobj ); + /* FIXME: Change signature==0 handling when wine generates correct RTTI data on 64-bit systems */ + if(obj_locator->signature == 0) + ret = obj_locator->type_descriptor; + else + { + const rtti_object_locator_x64 *obj_locator_x64 = (const rtti_object_locator_x64*)obj_locator; + ret = (type_info*)((char*)obj_locator_x64 - obj_locator_x64->object_locator + obj_locator_x64->type_descriptor); + } + } + __EXCEPT_PAGE_FAULT + { + __non_rtti_object e; + MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); + _CxxThrowException( &e, &bad_typeid_exception_type ); + return NULL; + } + __ENDTRY + return ret; +} +#endif + /****************************************************************** * __RTDynamicCast (MSVCRT.@) * diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index dbb948c..ddfb922 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -828,9 +828,63 @@ static void test_type_info(void) ok(res == 1, "expected 1, got %d\n", res); } +#ifndef __x86_64__ +#define RTTI_SIGNATURE 0 +#define DEFINE_RTTI_REF(type, name) type *name +#define RTTI_REF(instance, name) &instance.name +#else +#define RTTI_SIGNATURE 1 +#define DEFINE_RTTI_REF(type, name) unsigned name +#define RTTI_REF(instance, name) FIELD_OFFSET(struct rtti_data, name) +#endif /* Test RTTI functions */ static void test_rtti(void) { + struct rtti_data + { + type_info type_info[4]; + + struct _rtti_base_descriptor + { + DEFINE_RTTI_REF(type_info, type_descriptor); + int num_base_classes; + struct { + int this_offset; + int vbase_descr; + int vbase_offset; + } this_ptr_offsets; + unsigned int attributes; + } base_descriptor[4]; + + struct _rtti_base_array { + DEFINE_RTTI_REF(struct _rtti_base_descriptor, bases[4]); + } base_array; + + struct _rtti_object_hierarchy { + unsigned int signature; + unsigned int attributes; + int array_len; + DEFINE_RTTI_REF(struct _rtti_base_array, base_classes); + } object_hierarchy; + + struct { + unsigned int signature; + int base_class_offset; + unsigned int flags; + DEFINE_RTTI_REF(type_info, type_descriptor); + DEFINE_RTTI_REF(struct _rtti_object_hierarchy, type_hierarchy); + DEFINE_RTTI_REF(void, object_locator); + } object_locator; + } simple_class_rtti = { + { {NULL, NULL, "simple_class"} }, + { {RTTI_REF(simple_class_rtti, type_info[0]), 0, {0, 0, 0}, 0} }, + { {RTTI_REF(simple_class_rtti, base_descriptor[0])} }, + {0, 0, 1, RTTI_REF(simple_class_rtti, base_array)}, + {RTTI_SIGNATURE, 0, 0, RTTI_REF(simple_class_rtti, type_info[0]), RTTI_REF(simple_class_rtti, object_hierarchy), RTTI_REF(simple_class_rtti, object_locator)} + }; + void *simple_class_vtbl[2] = {&simple_class_rtti.object_locator}; + void *simple_class = &simple_class_vtbl[1]; + static const char* e_name = "name"; type_info *ti,*bti; exception e,b; @@ -865,6 +919,10 @@ static void test_rtti(void) call_func1(pexception_dtor, &e); call_func1(pbad_typeid_dtor, &b); + + ti = p__RTtypeid(&simple_class); + ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"), + "incorrect rtti data\n"); } struct _demangle {

1 0

Piotr Caban : msvcrt: Support 64-bit RTTI in __RTDynamicCast.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 33937f039f837e3328359d1c617b1424ce334b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33937f039f837e3328359d1c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 5 14:35:56 2012 +0200 msvcrt: Support 64-bit RTTI in __RTDynamicCast. --- dlls/msvcrt/cpp.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/cpp.c | 27 +++++++++++ 2 files changed, 140 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b1512f5..81f1d23 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -117,6 +117,37 @@ static void dump_obj_locator( const rtti_object_locator *ptr ) } } +#ifdef __x86_64__ +static void dump_obj_locator_x64( const rtti_object_locator_x64 *ptr ) +{ + int i; + char *base = (char*)ptr - ptr->object_locator; + const rtti_object_hierarchy_x64 *h = (const rtti_object_hierarchy_x64*)(base + ptr->type_hierarchy); + const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); + + TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", + ptr, ptr->signature, ptr->base_class_offset, ptr->flags, + type_descriptor, dbgstr_type_info(type_descriptor), h ); + TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", + h->signature, h->attributes, h->array_len, base + h->base_classes ); + for (i = 0; i < h->array_len; i++) + { + const rtti_base_descriptor_x64 *bases = (rtti_base_descriptor_x64*)(base + + ((const rtti_base_array_x64*)(base + h->base_classes))->bases[i]); + + TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", + bases, + bases->num_base_classes, + bases->offsets.this_offset, + bases->offsets.vbase_descr, + bases->offsets.vbase_offset, + bases->attributes, + base + bases->type_descriptor, + dbgstr_type_info((const type_info*)(base + bases->type_descriptor)) ); + } +} +#endif + /* Internal common ctor for exception */ static void EXCEPTION_ctor(exception *_this, const char** name) { @@ -919,6 +950,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) * This function is usually called by compiler generated code as a result * of using one of the C++ dynamic cast statements. */ +#ifndef __x86_64__ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, type_info *src, type_info *dst, int do_throw) @@ -982,6 +1014,87 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, return ret; } +#else + +void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, + type_info *src, type_info *dst, + int do_throw) +{ + void *ret; + + if (!cppobj) return NULL; + + TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", + cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); + + __TRY + { + int i; + const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); + + if(obj_locator->signature == 0) + { + const rtti_object_hierarchy *obj_bases = obj_locator->type_hierarchy; + const rtti_base_descriptor * const* base_desc = obj_bases->base_classes->bases; + + if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); + + ret = NULL; + for (i = 0; i < obj_bases->array_len; i++) + { + const type_info *typ = base_desc[i]->type_descriptor; + + if (!strcmp(typ->mangled, dst->mangled)) + { + void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; + ret = get_this_pointer( &base_desc[i]->offsets, this_ptr ); + break; + } + } + } + else + { + const rtti_object_locator_x64 *obj_locator_x64 = (const rtti_object_locator_x64*)obj_locator; + const char *base = (const char*)obj_locator_x64 - obj_locator_x64->object_locator; + const rtti_object_hierarchy_x64 *obj_bases = (const rtti_object_hierarchy_x64*)(base + obj_locator_x64->type_hierarchy); + const rtti_base_array_x64 *base_array = (const rtti_base_array_x64*)(base + obj_bases->base_classes); + + if (TRACE_ON(msvcrt)) dump_obj_locator_x64(obj_locator_x64); + + ret = NULL; + for (i = 0; i < obj_bases->array_len; i++) + { + const rtti_base_descriptor_x64 *base_desc = (const rtti_base_descriptor_x64*)(base + base_array->bases[i]); + const type_info *typ = (const type_info*)(base + base_desc->type_descriptor); + + if (!strcmp(typ->mangled, dst->mangled)) + { + void *this_ptr = (char *)cppobj - obj_locator_x64->base_class_offset; + ret = get_this_pointer( &base_desc->offsets, this_ptr ); + break; + } + } + } + if (!ret && do_throw) + { + const char *msg = "Bad dynamic_cast!"; + bad_cast e; + MSVCRT_bad_cast_ctor( &e, &msg ); + _CxxThrowException( &e, &bad_cast_exception_type ); + } + } + __EXCEPT_PAGE_FAULT + { + __non_rtti_object e; + MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); + _CxxThrowException( &e, &bad_typeid_exception_type ); + return NULL; + } + __ENDTRY + return ret; +} +#endif + /****************************************************************** * __RTCastToVoid (MSVCRT.@) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index ddfb922..b3dafbb 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -881,9 +881,17 @@ static void test_rtti(void) { {RTTI_REF(simple_class_rtti, base_descriptor[0])} }, {0, 0, 1, RTTI_REF(simple_class_rtti, base_array)}, {RTTI_SIGNATURE, 0, 0, RTTI_REF(simple_class_rtti, type_info[0]), RTTI_REF(simple_class_rtti, object_hierarchy), RTTI_REF(simple_class_rtti, object_locator)} + }, child_class_rtti = { + { {NULL, NULL, "simple_class"}, {NULL, NULL, "child_class"} }, + { {RTTI_REF(child_class_rtti, type_info[1]), 0, {4, -1, 0}, 0}, {RTTI_REF(child_class_rtti, type_info[0]), 0, {8, -1, 0}, 0} }, + { {RTTI_REF(child_class_rtti, base_descriptor[0]), RTTI_REF(child_class_rtti, base_descriptor[1])} }, + {0, 0, 2, RTTI_REF(child_class_rtti, base_array)}, + {RTTI_SIGNATURE, 0, 0, RTTI_REF(child_class_rtti, type_info[1]), RTTI_REF(child_class_rtti, object_hierarchy), RTTI_REF(child_class_rtti, object_locator)} }; void *simple_class_vtbl[2] = {&simple_class_rtti.object_locator}; void *simple_class = &simple_class_vtbl[1]; + void *child_class_vtbl[2] = {&child_class_rtti.object_locator}; + void *child_class = &child_class_vtbl[1]; static const char* e_name = "name"; type_info *ti,*bti; @@ -923,6 +931,25 @@ static void test_rtti(void) ti = p__RTtypeid(&simple_class); ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"), "incorrect rtti data\n"); + + casted = p__RTCastToVoid(&simple_class); + ok (casted == (void*)&simple_class, "failed cast to void\n"); + + ti = p__RTtypeid(&child_class); + ok (ti && ti->mangled && !strcmp(ti->mangled, "child_class"), + "incorrect rtti data\n"); + + casted = p__RTCastToVoid(&child_class); + ok (casted == (void*)&child_class, "failed cast to void\n"); + + casted = p__RTDynamicCast(&child_class, 0, NULL, simple_class_rtti.type_info, 0); + if(casted) + { + ok (casted == (char*)&child_class+8, "failed cast to simple_class (%p %p)\n", casted, &child_class); + } + + casted = p__RTDynamicCast(&child_class, 0, &child_class_rtti.type_info[0], &child_class_rtti.type_info[1], 0); + ok(casted == (char*)&child_class+4, "failed cast to child class (%p %p)\n", casted, &child_class); } struct _demangle {

1 0

Nikolay Sivov : user32: Release uniscribe data on Edit control destruction (valgrind).
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 6b1946154831c4537b9fffc4994cb0273db55918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1946154831c4537b9fffc49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 4 23:06:17 2012 +0400 user32: Release uniscribe data on Edit control destruction (valgrind). --- dlls/user32/edit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 226d737..278aa38 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4601,6 +4601,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) pc = pp; } + EDIT_InvalidateUniscribeData(es); SetWindowLongPtrW( es->hwndSelf, 0, 0 ); HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es);

1 0