October 2012 - Wine-commits

Piotr Caban : msvcrt: Fixed exception information on 64-bit systems.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 488693e4075bbd85525a2a9c9ce68cf5fe92aa50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488693e4075bbd85525a2a9c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 13:20:03 2012 +0200 msvcrt: Fixed exception information on 64-bit systems. --- dlls/msvcrt/cpp.c | 33 ++------------- dlls/msvcrt/cppexcept.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 8a8af42..ed5f751 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -666,34 +666,6 @@ __ASM_VTABLE(__non_rtti_object, } #endif -#define DEFINE_EXCEPTION_TYPE_INFO(name, base_classes, cl1, cl2) \ -static const cxx_type_info name ## _cxx_type_info = \ -{ \ - 0, \ - &name ## _type_info, \ - { 0, -1, 0 }, \ - sizeof(name), \ - (cxx_copy_ctor)THISCALL(MSVCRT_ ## name ## _copy_ctor) \ -}; \ -\ -static const cxx_type_info_table name ## _type_info_table = \ -{ \ - base_classes+1, \ - { \ - &name ## _cxx_type_info, \ - cl1, \ - cl2 \ - } \ -}; \ -\ -const cxx_exception_type name ## _exception_type = \ -{ \ - 0, \ - (void *)THISCALL(MSVCRT_ ## name ## _dtor), \ - NULL, \ - &name ## _type_info_table \ -} - DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ); DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ); DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ); @@ -713,6 +685,11 @@ void msvcrt_init_exception(void *base) init_bad_typeid_rtti(base); init_bad_cast_rtti(base); init___non_rtti_object_rtti(base); + + init_exception_cxx(base); + init_bad_typeid_cxx(base); + init_bad_cast_cxx(base); + init___non_rtti_object_cxx(base); #endif } diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 81066bf..d9ed2fa 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -55,6 +55,7 @@ typedef struct } this_ptr_offsets; /* complete information about a C++ type */ +#ifndef __x86_64__ typedef struct __cxx_type_info { UINT flags; /* flags (see CLASS_* flags below) */ @@ -63,15 +64,34 @@ typedef struct __cxx_type_info unsigned int size; /* object size */ cxx_copy_ctor copy_ctor; /* copy constructor */ } cxx_type_info; +#else +typedef struct __cxx_type_info +{ + UINT flags; + unsigned int type_info; + this_ptr_offsets offsets; + unsigned int size; + unsigned int copy_ctor; +} cxx_type_info; +#endif + #define CLASS_IS_SIMPLE_TYPE 1 #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 /* table of C++ types that apply for a given object */ +#ifndef __x86_64__ typedef struct __cxx_type_info_table { UINT count; /* number of types */ const cxx_type_info *info[3]; /* variable length, we declare it large enough for static RTTI */ } cxx_type_info_table; +#else +typedef struct __cxx_type_info_table +{ + UINT count; + unsigned int info[3]; +} cxx_type_info_table; +#endif struct __cxx_exception_frame; struct __cxx_function_descr; @@ -82,6 +102,7 @@ typedef DWORD (*cxx_exc_custom_handler)( PEXCEPTION_RECORD, struct __cxx_excepti EXCEPTION_REGISTRATION_RECORD *nested_frame, DWORD unknown3 ); /* type information for an exception object */ +#ifndef __x86_64__ typedef struct __cxx_exception_type { UINT flags; /* TYPE_FLAG flags */ @@ -89,6 +110,15 @@ typedef struct __cxx_exception_type cxx_exc_custom_handler custom_handler; /* custom handler for this exception */ const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; +#else +typedef struct +{ + UINT flags; + unsigned int destructor; + unsigned int custom_handler; + unsigned int type_info_table; +} cxx_exception_type; +#endif void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); @@ -119,4 +149,71 @@ static inline void *get_this_pointer( const this_ptr_offsets *off, void *object return this_ptr; } +#ifndef __x86_64__ +#define DEFINE_EXCEPTION_TYPE_INFO(type, base_no, cl1, cl2) \ +\ +static const cxx_type_info type ## _cxx_type_info = { \ + 0, \ + & type ##_type_info, \ + { 0, -1, 0 }, \ + sizeof(type), \ + (cxx_copy_ctor)THISCALL(MSVCRT_ ## type ##_copy_ctor) \ +}; \ +\ +static const cxx_type_info_table type ## _type_info_table = { \ + base_no+1, \ + { \ + & type ## _cxx_type_info, \ + cl1, \ + cl2 \ + } \ +}; \ +\ +static const cxx_exception_type type ## _exception_type = { \ + 0, \ + (cxx_copy_ctor)THISCALL(MSVCRT_ ## type ## _dtor), \ + NULL, \ + & type ## _type_info_table \ +}; + +#else + +#define DEFINE_EXCEPTION_TYPE_INFO(type, base_no, cl1, cl2) \ +\ +static cxx_type_info type ## _cxx_type_info = { \ + 0, \ + 0xdeadbeef, \ + { 0, -1, 0 }, \ + sizeof(type), \ + 0xdeadbeef \ +}; \ +\ +static cxx_type_info_table type ## _type_info_table = { \ + base_no+1, \ + { \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef \ + } \ +}; \ +\ +static cxx_exception_type type ##_exception_type = { \ + 0, \ + 0xdeadbeef, \ + 0, \ + 0xdeadbeef \ +}; \ +\ +static void init_ ## type ## _cxx(char *base) \ +{ \ + type ## _cxx_type_info.type_info = (char *)&type ## _type_info - base; \ + type ## _cxx_type_info.copy_ctor = (char *)MSVCRT_ ## type ## _copy_ctor - base; \ + type ## _type_info_table.info[0] = (char *)&type ## _cxx_type_info - base; \ + type ## _type_info_table.info[1] = (char *)cl1 - base; \ + type ## _type_info_table.info[2] = (char *)cl2 - base; \ + type ## _exception_type.destructor = (char *)MSVCRT_ ## type ## _dtor - base; \ + type ## _exception_type.type_info_table = (char *)&type ## _type_info_table - base; \ +} +#endif + #endif /* __MSVCRT_CPPEXCEPT_H */

1 0

Dmitry Timoshkov : gdiplus: Use IFD_SHORT type for the TIFF compression tag to avoid test failures under some XP versions .
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 9d49bb2b0038e70a223f4392431a757c94295a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d49bb2b0038e70a223f43924… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 11 12:33:30 2012 +0900 gdiplus: Use IFD_SHORT type for the TIFF compression tag to avoid test failures under some XP versions. --- dlls/gdiplus/tests/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 62bc48b..46e250d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3006,7 +3006,7 @@ static const struct tiff_data { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ { 0x102, IFD_SHORT, 1, 1 }, /* BITSPERSAMPLE */ - { 0x103, IFD_LONG, 1, 1 }, /* COMPRESSION */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ { 0x106, IFD_SHORT, 1, 1 }, /* PHOTOMETRIC */ { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_data, pixel_data) }, /* STRIPOFFSETS */ { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ @@ -3065,7 +3065,7 @@ static void test_tiff_properties(void) { PropertyTagTypeLong, 0x100, 4, { 1 } }, { PropertyTagTypeLong, 0x101, 4, { 1 } }, { PropertyTagTypeShort, 0x102, 2, { 1 } }, - { PropertyTagTypeLong, 0x103, 4, { 1 } }, + { PropertyTagTypeShort, 0x103, 2, { 1 } }, { PropertyTagTypeShort, 0x106, 2, { 1 } }, { PropertyTagTypeLong, 0x111, 4, { 0x44,0x02 } }, { PropertyTagTypeShort, 0x115, 2, { 1 } },

1 0

André Hentschel : include: Update EXTENDED_NAME_FORMAT enumeration.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 429e47f29a5650456b2a58e47f578a80394d701c URL: http://source.winehq.org/git/wine.git/?a=commit;h=429e47f29a5650456b2a58e47… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 10 21:08:05 2012 +0200 include: Update EXTENDED_NAME_FORMAT enumeration. --- include/secext.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/secext.h b/include/secext.h index 1f04d3d..42b4b3e 100644 --- a/include/secext.h +++ b/include/secext.h @@ -34,7 +34,9 @@ typedef enum NameUserPrincipal = 8, NameCanonicalEx = 9, NameServicePrincipal = 10, - NameDnsDomain = 12 + NameDnsDomain = 12, + NameGivenName = 13, + NameSurname = 14, } EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT; BOOLEAN WINAPI GetComputerObjectNameA( EXTENDED_NAME_FORMAT, LPSTR, PULONG );

1 0

Sergey Guralnik : user32/tests: Add tests for class small icons.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: e193e43c2982cf2940b29af52a8bba6d0e8784b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e193e43c2982cf2940b29af52… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Oct 10 14:34:01 2012 +0400 user32/tests: Add tests for class small icons. --- dlls/user32/tests/class.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 1fa9b9b..8e4be6a 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -977,6 +977,63 @@ if (0) { /* crashes under XP */ ok(wcx.lpfnWndProc != NULL, "got null proc\n"); } +static void test_icons(void) +{ + WNDCLASSEXW wcex, ret_wcex; + WCHAR cls_name[] = {'I','c','o','n','T','e','s','t','C','l','a','s','s',0}; + HWND hwnd; + HINSTANCE hinst = GetModuleHandleW(0); + HICON hsmicon, hsmallnew; + ICONINFO icinf; + + memset(&wcex, 0, sizeof wcex); + wcex.cbSize = sizeof wcex; + wcex.lpfnWndProc = ClassTest_WndProc; + wcex.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wcex.hInstance = hinst; + wcex.lpszClassName = cls_name; + ok(RegisterClassExW(&wcex), "RegisterClassExW returned 0\n"); + hwnd = CreateWindowExW(0, cls_name, NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, hinst, 0); + ok(hwnd != NULL, "Window was not created\n"); + + ok(GetClassInfoExW(hinst, cls_name, &ret_wcex), "Class info was not retrieved\n"); + ok(wcex.hIcon == ret_wcex.hIcon, "Icons don't match\n"); +todo_wine + ok(ret_wcex.hIconSm != NULL, "hIconSm should be non-zero handle\n"); + + hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); +todo_wine + ok(hsmicon != NULL, "GetClassLong should return non-zero handle\n"); + + hsmallnew = CopyImage(wcex.hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), 0); + ok(!SetClassLongPtrW(hwnd, GCLP_HICONSM, (LONG_PTR)hsmallnew), + "Previous hIconSm should be zero\n"); + ok(hsmallnew == (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM), + "Should return explicitly assigned small icon"); + ok(!GetIconInfo(hsmicon, &icinf), "Previous small icon should be destroyed\n"); + + SetClassLongPtrW(hwnd, GCLP_HICONSM, 0); + hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); +todo_wine + ok( hsmicon != NULL, "GetClassLong should return non-zero handle\n"); + + SetClassLongPtrW(hwnd, GCLP_HICON, 0); + ok(!GetClassLongPtrW(hwnd, GCLP_HICONSM), "GetClassLong should return zero handle\n"); + + SetClassLongPtrW(hwnd, GCLP_HICON, (LONG_PTR)LoadIconW(NULL, (LPCWSTR)IDI_QUESTION)); + hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); +todo_wine + ok(hsmicon != NULL, "GetClassLong should return non-zero handle\n"); + UnregisterClassW(cls_name, hinst); +todo_wine + ok(GetIconInfo(hsmicon, &icinf), "Icon should NOT be destroyed\n"); + + DestroyIcon(hsmallnew); + DestroyWindow(hwnd); +} + START_TEST(class) { HANDLE hInstance = GetModuleHandleA( NULL ); @@ -995,6 +1052,7 @@ START_TEST(class) CreateDialogParamTest(hInstance); test_styles(); test_builtinproc(); + test_icons(); /* this test unregisters the Button class so it should be executed at the end */ test_instances();

1 0

Frédéric Delanoy : cmd/tests: Move command line tests to separate file.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 0ab71a42b4a23e5aef74c476eb6c63bf099651a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab71a42b4a23e5aef74c476e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 11 03:08:01 2012 +0200 cmd/tests: Move command line tests to separate file. --- programs/cmd/tests/rsrc.rc | 6 ++ programs/cmd/tests/test_builtins.cmd | 90 ------------------------------ programs/cmd/tests/test_builtins.cmd.exp | 48 ---------------- programs/cmd/tests/test_cmdline.cmd | 90 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_cmdline.cmd.exp | 47 +++++++++++++++ 5 files changed, 143 insertions(+), 138 deletions(-) diff --git a/programs/cmd/tests/rsrc.rc b/programs/cmd/tests/rsrc.rc index bcb738d..affe04c 100644 --- a/programs/cmd/tests/rsrc.rc +++ b/programs/cmd/tests/rsrc.rc @@ -21,3 +21,9 @@ test_builtins.cmd TESTCMD "test_builtins.cmd" /* @makedep: test_builtins.cmd.exp */ test_builtins.cmd.exp TESTOUT "test_builtins.cmd.exp" + +/* @makedep: test_cmdline.cmd */ +test_cmdline.cmd TESTCMD "test_cmdline.cmd" + +/* @makedep: test_cmdline.cmd.exp */ +test_cmdline.cmd.exp TESTOUT "test_cmdline.cmd.exp" diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bdd6cd0..8a47238 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1820,96 +1820,6 @@ set var= set var2= cd .. & rd /q/s foobar -echo ------------ cmd.exe command lines ------------ -mkdir foobar -cd foobar -echo file1 > file1 - -rem Basic test of command line. Note a section prefix per command -rem to resync, as wine does not output anything in these cases yet. -echo --- Test 1 -cmd.exe /c echo Line1 -cmd.exe /c echo "Line2" -echo --- Test 2 -cmd.exe /c echo Test quotes "&" work -echo --- Test 3 -cmd.exe /c echo "&" -echo --- Test 4 -cmd.exe /c echo "<" -echo --- Test 5 -cmd.exe /c echo ">" -echo --- Test 6 -cmd.exe /c echo "\" -echo --- Test 7 -cmd.exe /c echo "|" -echo --- Test 8 -cmd.exe /c echo "`" -echo --- Test 9 -cmd.exe /c echo """ -echo --- Test 10 -echo on > file3 -(a)type file3 -(a)echo off -echo --- Test 11 -cmd.exe /c echo on >file3 -(a)type file3 -(a)echo off -echo --- Test 12 -cmd.exe /c "echo passed1" -echo --- Test 13 -cmd.exe /c " echo passed2 " -echo --- Test 14 -cmd.exe /c "dir /ad ..\fooba* /b" -echo --- Test 15 -cmd.exe /cecho No whitespace -echo --- Test 16 -cmd.exe /c -echo --- Test 17 -cmd.exe /c(a)space@ -echo --- Test 18 -rem Ensure no interactive prompting when cmd.exe /c or /k -echo file2 > file2 -cmd.exe /c copy file1 file2 >nul -echo No prompts or I would not get here1 -rem - Try cmd.exe /k as well -cmd.exe /k "copy file1 file2 >nul && exit" -echo No prompts or I would not get here2 - -rem Non existing variable expansion is as per command line, ie left as-is -cmd.exe /c echo %%hello1%% -cmd.exe /c echo %%hello2 -cmd.exe /c echo %%hello3^:h=t%% -cmd.exe /c echo %%hello4%%%% - -rem Cannot issue a call from cmd.exe /c -cmd.exe /c call :hello5 - -rem %1-9 has no meaning -cmd.exe /c echo one = %%1 - -rem for loop vars need expanding -cmd.exe /c for /L %%i in (1,1,5) do @echo %%i - -rem goto's are ineffective -cmd.exe /c goto :fred -cmd.exe /c goto eof - -rem - %var% is expanded at read time, not execute time -set var=11 -cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && echo var contents: %%var%%" - -rem - endlocal ineffective on cmd.exe /c lines -cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && set var" -set var=99 - -rem - Environment is inherited ok -cmd.exe /c ECHO %%VAR%% - -rem - Exit works -cmd.exe /c exit - -cd .. -rd foobar /s /q echo ------------ Testing Errorlevel ------------ rem WARNING: Do *not* add tests using ErrorLevel after this section should_not_exist 2> nul > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1d004b7..4bab1ef 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -907,54 +907,6 @@ value1 2 1 1 ------------- cmd.exe command lines ------------ ---- Test 1 -Line1 -"Line2" ---- Test 2 -Test quotes "&" work ---- Test 3 -"&" ---- Test 4 -"<" ---- Test 5 -">" ---- Test 6 -"\" ---- Test 7 -"|" ---- Test 8 -"`" ---- Test 9 -""" ---- Test 10 ---- Test 11 ---- Test 12 -passed1 ---- Test 13 -passed2(a)space@ ---- Test 14 -foobar ---- Test 15 -No whitespace ---- Test 16 ---- Test 17 ---- Test 18 -No prompts or I would not get here1 -No prompts or I would not get here2 -%hello1% -%hello2 -%hello3:h=t% -%hello4%% -one = %1 -1 -2 -3 -4 -5 -(a)todo_wine@var contents: 11 -var=33(a)space@ -99 ------------ Testing Errorlevel ------------ 9009 1 diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd new file mode 100644 index 0000000..ad035ab --- /dev/null +++ b/programs/cmd/tests/test_cmdline.cmd @@ -0,0 +1,90 @@ +(a)echo off +mkdir foobar +cd foobar +echo file1 > file1 + +rem Basic test of command line. Note a section prefix per command +rem to resync, as wine does not output anything in these cases yet. +echo --- Test 1 +cmd.exe /c echo Line1 +cmd.exe /c echo "Line2" +echo --- Test 2 +cmd.exe /c echo Test quotes "&" work +echo --- Test 3 +cmd.exe /c echo "&" +echo --- Test 4 +cmd.exe /c echo "<" +echo --- Test 5 +cmd.exe /c echo ">" +echo --- Test 6 +cmd.exe /c echo "\" +echo --- Test 7 +cmd.exe /c echo "|" +echo --- Test 8 +cmd.exe /c echo "`" +echo --- Test 9 +cmd.exe /c echo """ +echo --- Test 10 +echo on > file3 +(a)type file3 +(a)echo off +echo --- Test 11 +cmd.exe /c echo on >file3 +(a)type file3 +(a)echo off +echo --- Test 12 +cmd.exe /c "echo passed1" +echo --- Test 13 +cmd.exe /c " echo passed2 " +echo --- Test 14 +cmd.exe /c "dir /ad ..\fooba* /b" +echo --- Test 15 +cmd.exe /cecho No whitespace +echo --- Test 16 +cmd.exe /c +echo --- Test 17 +cmd.exe /c(a)space@ +echo --- Test 18 +rem Ensure no interactive prompting when cmd.exe /c or /k +echo file2 > file2 +cmd.exe /c copy file1 file2 >nul +echo No prompts or I would not get here1 +rem - Try cmd.exe /k as well +cmd.exe /k "copy file1 file2 >nul && exit" +echo No prompts or I would not get here2 + +rem Non existing variable expansion is as per command line, i.e. left as-is +cmd.exe /c echo %%hello1%% +cmd.exe /c echo %%hello2 +cmd.exe /c echo %%hello3^:h=t%% +cmd.exe /c echo %%hello4%%%% + +rem Cannot issue a call from cmd.exe /c +cmd.exe /c call :hello5 + +rem %1-9 has no meaning +cmd.exe /c echo one = %%1 + +rem for loop vars need expanding +cmd.exe /c for /L %%i in (1,1,5) do @echo %%i + +rem goto's are ineffective +cmd.exe /c goto :fred +cmd.exe /c goto eof + +rem - %var% is expanded at read time, not execute time +set var=11 +cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && echo var contents: %%var%%" + +rem - endlocal ineffective on cmd.exe /c lines +cmd.exe /c "set var=22 && setlocal && set var=33 && endlocal && set var" +set var=99 + +rem - Environment is inherited ok +cmd.exe /c ECHO %%VAR%% + +rem - Exit works +cmd.exe /c exit + +cd .. +rd foobar /s /q diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp new file mode 100644 index 0000000..36645da --- /dev/null +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -0,0 +1,47 @@ +--- Test 1 +Line1 +"Line2" +--- Test 2 +Test quotes "&" work +--- Test 3 +"&" +--- Test 4 +"<" +--- Test 5 +">" +--- Test 6 +"\" +--- Test 7 +"|" +--- Test 8 +"`" +--- Test 9 +""" +--- Test 10 +--- Test 11 +--- Test 12 +passed1 +--- Test 13 +passed2(a)space@ +--- Test 14 +foobar +--- Test 15 +No whitespace +--- Test 16 +--- Test 17 +--- Test 18 +No prompts or I would not get here1 +No prompts or I would not get here2 +%hello1% +%hello2 +%hello3:h=t% +%hello4%% +one = %1 +1 +2 +3 +4 +5 +(a)todo_wine@var contents: 11 +var=33(a)space@ +99

1 0

Frédéric Delanoy : cmd/tests: Add tests for command line parsing.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 3803134fce8bdc4074107f2573f5db749a56367d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3803134fce8bdc4074107f257… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 11 03:08:02 2012 +0200 cmd/tests: Add tests for command line parsing. Adapted from original patch by Martin Wilck <mwilck(a)arcor.de>. --- programs/cmd/tests/test_cmdline.cmd | 167 +++++++++++++++++++++++++++++++ programs/cmd/tests/test_cmdline.cmd.exp | 77 ++++++++++++++ 2 files changed, 244 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index ad035ab..7e08b29 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -88,3 +88,170 @@ cmd.exe /c exit cd .. rd foobar /s /q + +rem - Temporary batch files +echo @echo 0 > "say.bat" +echo @echo 1 > "say one.bat" +echo @echo 2 > "saytwo.bat" +echo @echo 3 > "say (3).bat" +echo @echo 4 > "say .bat" + +echo ------ Testing invocation of batch files ---------- +call say one +call "say one" +call "say"" one" +call "say one +call :setError 0 +call say" one" +if errorlevel 2 echo error %ErrorLevel% +call say "one" +call :setError 0 +call s"ay one +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +call s"aytwo +if errorlevel 2 echo error %ErrorLevel% +call say (3) +call "say (3)" +call :setError 0 +call say" (3)" +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +call say" "(3) prints 4?! +if errorlevel 2 echo error %ErrorLevel% + +echo ------ Testing invocation with CMD /C ------------- +cmd /c say one +cmd /c "say one" +call :setError 0 +cmd /c "say"" one" +if errorlevel 2 echo error %ErrorLevel% +cmd /c "say one +call :setError 0 +cmd /c say" one" +if errorlevel 2 echo error %ErrorLevel% +cmd /c say "one" +call :setError 0 +cmd /c s"ay one +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +cmd /c s"aytwo +if errorlevel 2 echo error %ErrorLevel% +cmd /c say (3) +call :setError 0 +cmd /c say" (3)" +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +cmd /c say" "(3) prints 4?! +if errorlevel 2 echo error %ErrorLevel% + +echo ---------- Testing CMD /C quoting ----------------- +cmd /c @echo "hi" +call :setError 0 +cmd /c say" "one +if errorlevel 2 echo error %ErrorLevel% +cmd /c @echo "\"\\"\\\"\\\\" "\"\\"\\\"\\\\" +rem ---- all 5 conditions met, quotes preserved +cmd /c "say one" +rem cond 1 - /s +cmd /s/c "say one" +cmd /s/c ""say one"" +rem cond 2 - not 2 quotes +cmd /c "say one +call :setError 0 +cmd /c "say"" one" +if errorlevel 2 echo error %ErrorLevel% +rem cond 3 - special char - first test fails on Vista, W2K8! +cmd /c "say (3)" +cmd /c ""say (3)"" +rem cond 4 - no spaces (quotes make no difference here) +cmd /c saytwo +cmd /c "saytwo" +cmd /c "saytwo +rem cond 5 - string between quotes must be name of executable +cmd /c "say five" +echo @echo 5 >"say five.bat" +cmd /c "say five" + +echo ------- Testing CMD /C qualifier treatment ------------ +rem no need for space after /c +cmd /csay one +cmd /c"say one" +rem ignore quote before qualifier +rem FIXME the next command in wine starts a sub-CMD +echo THIS FAILS: cmd "/c"say one +rem ignore anything before /c +rem FIXME the next command in wine starts a sub-CMD +echo THIS FAILS: cmd ignoreme/c say one + +echo --------- Testing special characters -------------- +echo @echo amp > "say&.bat" +call say& +echo @echo ( > "say(.bat" +call say( +echo @echo ) > "say).bat" +call say) +echo @echo [ > "say[.bat" +call say[ +echo @echo ] > "say].bat" +call say] +echo @echo { > "say{.bat" +call say{ +echo @echo } > "say}.bat" +call say} +echo @echo = > "say=.bat" +call say= +echo @echo sem > "say;.bat" +call say; +setlocal DisableDelayedExpansion +echo @echo ! > "say!.bat" +call say! +endlocal +setlocal EnableDelayedExpansion +call say! +endlocal +echo @echo %%%% > "say%%.bat" +call say%% +echo @echo ' > "say'.bat" +call say' +echo @echo + > "say+.bat" +call say+ +echo @echo com > "say,.bat" +call say, +echo @echo ` > "say`.bat" +call say' +echo @echo ~ > "say~.bat" +call say~ + +echo --------- Testing parameter passing -------------- +echo @echo 1:%%1,2:%%2 > tell.bat +call tell 1 +call tell (1) +call tell 1(2) +call :setError 0 +call tell(1) +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +call tell((1)) +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +call tell(1)(2) +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +call tell(1);,;(2) +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +call tell;1 2 +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +call tell; 1, ;2 +if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +call tell;1;;2 +if errorlevel 2 echo error %ErrorLevel% +call tell "p "1 p" "2 +call tell p"1 p";2 +del tell.bat say*.* +exit +:setError +exit /B %1 diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 36645da..7e9ac32 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -45,3 +45,80 @@ one = %1 @todo_wine(a)var contents: 11 var=33(a)space@ 99 +------ Testing invocation of batch files ---------- +0(a)space@ +1(a)space@ +(a)todo_wine@1(a)space@ +1(a)space@ +(a)todo_wine@1(a)space@ +0(a)space@ +(a)todo_wine@1(a)space@ +(a)todo_wine@2(a)space@ +0(a)space@ +3(a)space@ +(a)todo_wine@3(a)space@ +(a)todo_wine@4(a)space@ +------ Testing invocation with CMD /C ------------- +0(a)space@ +(a)todo_wine@1(a)space@ +(a)todo_wine@0(a)space@ +0(a)space@ +(a)todo_wine@1(a)space@ +0(a)space@ +(a)todo_wine@1(a)space@ +(a)todo_wine@2(a)space@ +0(a)space@ +(a)todo_wine@3(a)space@ +(a)todo_wine@4(a)space@ +---------- Testing CMD /C quoting ----------------- +"hi" +(a)todo_wine@1(a)space@ +"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\" +(a)todo_wine@1(a)space@ +0(a)space@ +1(a)space@ +0(a)space@ +(a)todo_wine@0(a)space@ +0(a)space@@or_broken(a)3@space@ +3(a)space@ +2(a)space@ +2(a)space@ +2(a)space@ +0(a)space@ +(a)todo_wine@5(a)space@ +------- Testing CMD /C qualifier treatment ------------ +0(a)space@ +(a)todo_wine@1(a)space@ +THIS FAILS: cmd "/c"say one +THIS FAILS: cmd ignoreme/c say one +--------- Testing special characters -------------- +0(a)space@ +(a)todo_wine@0(a)space@ +)@space@ +[@space@ +]@space@ +{@space@ +}@space@ +0(a)space@ +(a)todo_wine@0(a)space@ +!@space@ +(a)todo_wine@0(a)space@@or_broken@!@space@ +(a)todo_wine@0(a)space@ +'@space@ ++(a)space@ +0(a)space@ +'@space@ +~@space@ +--------- Testing parameter passing -------------- +1:1,2:@space@ +1:(1),2:@space@ +1:1(2),2:@space@ +(a)todo_wine@1:(1),2:@space@ +(a)todo_wine@1:((1)),2:@space@ +(a)todo_wine@1:(1)(2),2:@space@ +(a)todo_wine@1:(1),2:(2)@space@ +(a)todo_wine@1:1,2:2(a)space@ +(a)todo_wine@1:1,2:2(a)space@ +(a)todo_wine@1:1,2:2(a)space@ +1:"p(a)space@"1,2:p"@space@"2(a)space@ +1:p"1(a)space@p",2:2(a)space@

1 0

Dmitry Timoshkov : gdiplus: Clarify where extra Y margin added by GdipMeasureString comes from.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 608a936adaa40c2a8ddd554c7d742f15e330ae7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=608a936adaa40c2a8ddd554c7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 11 19:49:13 2012 +0900 gdiplus: Clarify where extra Y margin added by GdipMeasureString comes from. --- dlls/gdiplus/tests/font.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index d710a5b..c06a954 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -824,7 +824,7 @@ static void test_font_transform(void) GpMatrix *matrix; GpStringFormat *format, *typographic; PointF pos[1] = { { 0,0 } }; - REAL height; + REAL height, margin_y; RectF bounds, rect; hdc = CreateCompatibleDC(0); @@ -846,6 +846,8 @@ static void test_font_transform(void) status = GdipCreateFontFromLogfontA(hdc, &lf, &font); expect(Ok, status); + margin_y = 100.0 / 8.0; + /* identity matrix */ status = GdipCreateMatrix(&matrix); expect(Ok, status); @@ -865,7 +867,7 @@ static void test_font_transform(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(133.203125, bounds.Height); + expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); @@ -873,7 +875,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); @@ -882,7 +884,7 @@ todo_wine todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); /* scale matrix */ status = GdipScaleMatrix(matrix, 2.0, 3.0, MatrixOrderAppend); @@ -904,7 +906,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(133.203125, bounds.Height); + expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); @@ -912,7 +914,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); @@ -921,7 +923,7 @@ todo_wine todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); /* scale + ratate matrix */ status = GdipRotateMatrix(matrix, 45.0, MatrixOrderAppend); @@ -943,7 +945,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(133.203125, bounds.Height); + expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); @@ -951,7 +953,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); @@ -960,7 +962,7 @@ todo_wine todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); /* scale + ratate + shear matrix */ status = GdipShearMatrix(matrix, 4.0, 5.0, MatrixOrderAppend); @@ -982,7 +984,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(133.203125, bounds.Height); + expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); @@ -990,7 +992,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); @@ -999,7 +1001,7 @@ todo_wine todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); /* scale + ratate + shear + translate matrix */ status = GdipTranslateMatrix(matrix, 10.0, 20.0, MatrixOrderAppend); @@ -1021,7 +1023,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(133.203125, bounds.Height); + expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); @@ -1029,7 +1031,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); @@ -1038,7 +1040,7 @@ todo_wine todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine - expectf(120.703125, bounds.Height); + expectf(height, bounds.Height); GdipDeleteMatrix(matrix); GdipDeleteFont(font);

1 0

Dmitry Timoshkov : gdiplus: Clarify where extra Y margin added by GdipMeasureString comes from.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: ca9182534556f2a34a8348f01c29ce4ea18f2f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9182534556f2a34a8348f01… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 11 19:50:07 2012 +0900 gdiplus: Clarify where extra Y margin added by GdipMeasureString comes from. --- dlls/gdiplus/tests/graphics.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5ee5002..475f7d6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3821,17 +3821,25 @@ static void test_font_height_scaling(void) { static const WCHAR doubleW[2] = { 'W','W' }; RectF bounds_1, bounds_2; - REAL margin; + REAL margin, margin_y, font_height; int match; status = GdipSetPageUnit(graphics, gfx_unit); expect(Ok, status); + margin_y = units_to_pixels(height / 8.0, font_unit, dpi); + margin_y = pixels_to_units(margin_y, gfx_unit, dpi); + + status = GdipGetFontHeight(font, graphics, &font_height); + expect(Ok, status); + set_rect_empty(&rect); set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); expect(Ok, status); /*trace("bounds: %f,%f,%f,%f\n", bounds.X, bounds.Y, bounds.Width, bounds.Height);*/ +todo_wine + expectf_(font_height + margin_y, bounds.Height, 0.005); ptf.X = 0; ptf.Y = bounds.Height; @@ -3864,9 +3872,6 @@ todo_wine /*trace("margin %f\n", margin);*/ ok(margin > 0.0, "wrong margin %f\n", margin); - status = GdipGetFontHeight(font, graphics, &height); - expect(Ok, status); - set_rect_empty(&rect); rect.Width = 320000.0; rect.Height = 320000.0; @@ -3880,9 +3885,9 @@ todo_wine expectf(0.0, rect.Y); match = fabs(1.0 - margin / rect.X) <= 0.05; ok(match, "Expected %f, got %f\n", margin, rect.X); - match = fabs(1.0 - height / rect.Height) <= 0.1; + match = fabs(1.0 - font_height / rect.Height) <= 0.1; todo_wine - ok(match, "Expected %f, got %f\n", height, rect.Height); + ok(match, "Expected %f, got %f\n", font_height, rect.Height); match = fabs(1.0 - bounds.Width / (rect.Width + margin * 2.0)) <= 0.05; ok(match, "Expected %f, got %f\n", bounds.Width, rect.Width + margin * 2.0); }

1 0

Nozomi Kodama : d3dx9_36: Remove useless casts.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 80b73ffcef7ae36f30f437ffc3e64b3b7df4033c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b73ffcef7ae36f30f437ffc… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 9 17:59:00 2012 -1000 d3dx9_36: Remove useless casts. --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 3eb31f9..166b14a 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2431,8 +2431,8 @@ static void test_D3DXSHDot(void) for (i = 0; i < 49; i++) { - a[i] = (FLOAT)i + 1.0f; - b[i] = (FLOAT)i + 0.5f; + a[i] = i + 1.0f; + b[i] = i + 0.5f; } /* D3DXSHDot computes by using order * order elements */

1 0

Matteo Bruni : d3dcompiler: Avoid "naked" vars in record dereferences.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 426b5b360989dbcfde16de4c009c4f02f8e60448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426b5b360989dbcfde16de4c0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 11 19:48:45 2012 +0200 d3dcompiler: Avoid "naked" vars in record dereferences. --- dlls/d3dcompiler_43/utils.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index eca67c9..5bd39e8 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1568,7 +1568,10 @@ struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_ deref->node.type = HLSL_IR_DEREF; deref->node.data_type = field->type; deref->type = HLSL_IR_DEREF_RECORD; - deref->v.record.record = record; + if (record->type == HLSL_IR_VAR) + deref->v.record.record = &new_var_deref(var_from_node(record))->node; + else + deref->v.record.record = record; deref->v.record.field = field; return deref; }

1 0