November 2015 - Wine-Commits

Nikolay Sivov : oleaut32: Remove unused tracing macro.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: 68d09afc28c1d1af816802feabceb47a38a00028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d09afc28c1d1af816802fea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 15 19:14:10 2015 +0300 oleaut32: Remove unused tracing macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/varformat.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index a4969c2..696763e 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -51,15 +51,6 @@ static const WCHAR szPercent_d[] = { '%','d','\0' }; static const WCHAR szPercentZeroTwo_d[] = { '%','0','2','d','\0' }; static const WCHAR szPercentZeroStar_d[] = { '%','0','*','d','\0' }; -#if 0 -#define dump_tokens(rgb) do { \ - int i_; TRACE("Tokens->{\n"); \ - for (i_ = 0; i_ < rgb[0]; i_++) \ - TRACE("%s0x%02x", i_?",":"",rgb[i_]); \ - TRACE(" }\n"); \ - } while(0) -#endif - /****************************************************************************** * Variant-Formats {OLEAUT32} *

1 0

Andrew Nguyen : dinput: Allow EnumDevices callback functions with broken calling conventions.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: 6566cd76ce56cc2cfca16123b16a286f02d27327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6566cd76ce56cc2cfca16123b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Nov 16 08:25:45 2015 +0100 dinput: Allow EnumDevices callback functions with broken calling conventions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index aef9d10..24e7951 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -339,6 +339,25 @@ static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) return priorityFlags; } +#ifdef __i386__ +extern BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref); +__ASM_GLOBAL_FUNC( enum_callback_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +#define enum_callback_wrapper(callback, instance, ref) (callback)((instance), (ref)) +#endif + /****************************************************************************** * IDirectInputA_EnumDevices */ @@ -371,7 +390,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) - if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) + if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) return S_OK; } } @@ -411,7 +430,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) - if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) + if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) return S_OK; } }

1 0

Vincent Povirk : setupapi: Add a manifest to indicate the tests don' t need elevation.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: 295346f81d05e7669c512aec278fa9ea25b0f983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=295346f81d05e7669c512aec2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Nov 15 20:23:28 2015 -0600 setupapi: Add a manifest to indicate the tests don't need elevation. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 2 ++ dlls/setupapi/tests/setupapi.manifest | 11 +++++++++++ dlls/setupapi/tests/setupapi.rc | 25 +++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 30902e7..083e576 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -10,3 +10,5 @@ C_SRCS = \ query.c \ setupcab.c \ stringtable.c + +RC_SRCS = setupapi.rc diff --git a/dlls/setupapi/tests/setupapi.manifest b/dlls/setupapi/tests/setupapi.manifest new file mode 100644 index 0000000..d0e3692 --- /dev/null +++ b/dlls/setupapi/tests/setupapi.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Wine.SetupapiTest" version="0.0.0.0"/> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" uiAccess="false"/> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> diff --git a/dlls/setupapi/tests/setupapi.rc b/dlls/setupapi/tests/setupapi.rc new file mode 100644 index 0000000..3af9a20 --- /dev/null +++ b/dlls/setupapi/tests/setupapi.rc @@ -0,0 +1,25 @@ +/* + * setupapi test resources + * + * Copyright 2015 Vincent Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <winuser.rh> + +/* @makedep: setupapi.manifest */ +1 RT_MANIFEST setupapi.manifest

1 0

Sebastian Lackner : server: Do not require SeBackupPrivilege in load_registry and unload_registry.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: 96f4f53937915955063865d2949265d8d1576794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f4f53937915955063865d29… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 16 08:32:29 2015 +0100 server: Do not require SeBackupPrivilege in load_registry and unload_registry. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 109 ++++++++++++++++++++++++----------------- server/registry.c | 20 +------- 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 8808822..254a8b6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1513,39 +1513,6 @@ static void test_reg_delete_key(void) RegCloseKey(key); } -static void test_reg_save_key(void) -{ - DWORD ret; - - ret = RegSaveKeyA(hkey_main, "saved_key", NULL); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); -} - -static void test_reg_load_key(void) -{ - DWORD ret; - HKEY hkHandle; - - ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", "saved_key"); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); - - ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &hkHandle); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); - - RegCloseKey(hkHandle); -} - -static void test_reg_unload_key(void) -{ - DWORD ret; - - ret = RegUnLoadKeyA(HKEY_LOCAL_MACHINE, "Test"); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); - - DeleteFileA("saved_key"); - DeleteFileA("saved_key.LOG"); -} - static BOOL set_privileges(LPCSTR privilege, BOOL set) { TOKEN_PRIVILEGES tp; @@ -1580,6 +1547,66 @@ static BOOL set_privileges(LPCSTR privilege, BOOL set) return TRUE; } +static void test_reg_save_key(void) +{ + DWORD ret; + + if (!set_privileges(SE_BACKUP_NAME, TRUE) || + !set_privileges(SE_RESTORE_NAME, FALSE)) + { + win_skip("Failed to set SE_BACKUP_NAME privileges, skipping tests\n"); + return; + } + + ret = RegSaveKeyA(hkey_main, "saved_key", NULL); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + set_privileges(SE_BACKUP_NAME, FALSE); +} + +static void test_reg_load_key(void) +{ + DWORD ret; + HKEY hkHandle; + + if (!set_privileges(SE_RESTORE_NAME, TRUE) || + !set_privileges(SE_BACKUP_NAME, FALSE)) + { + win_skip("Failed to set SE_RESTORE_NAME privileges, skipping tests\n"); + return; + } + + ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", "saved_key"); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + set_privileges(SE_RESTORE_NAME, FALSE); + + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &hkHandle); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + RegCloseKey(hkHandle); +} + +static void test_reg_unload_key(void) +{ + DWORD ret; + + if (!set_privileges(SE_RESTORE_NAME, TRUE) || + !set_privileges(SE_BACKUP_NAME, FALSE)) + { + win_skip("Failed to set SE_RESTORE_NAME privileges, skipping tests\n"); + return; + } + + ret = RegUnLoadKeyA(HKEY_LOCAL_MACHINE, "Test"); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + set_privileges(SE_RESTORE_NAME, FALSE); + + DeleteFileA("saved_key"); + DeleteFileA("saved_key.LOG"); +} + /* tests that show that RegConnectRegistry and OpenSCManager accept computer names without the \\ prefix (what MSDN says). */ @@ -3275,19 +3302,9 @@ START_TEST(registry) test_classesroot(); test_classesroot_enum(); test_classesroot_mask(); - - /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ - if (set_privileges(SE_BACKUP_NAME, TRUE) && - set_privileges(SE_RESTORE_NAME, TRUE)) - { - test_reg_save_key(); - test_reg_load_key(); - test_reg_unload_key(); - - set_privileges(SE_BACKUP_NAME, FALSE); - set_privileges(SE_RESTORE_NAME, FALSE); - } - + test_reg_save_key(); + test_reg_load_key(); + test_reg_unload_key(); test_reg_delete_tree(); test_rw_order(); test_deleted_key(); diff --git a/server/registry.c b/server/registry.c index c95e103..a3c1390 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2182,17 +2182,9 @@ DECL_HANDLER(delete_key_value) DECL_HANDLER(load_registry) { struct key *key, *parent; - struct token *token = thread_get_impersonation_token( current ); struct unicode_str name; - const LUID_AND_ATTRIBUTES privs[] = - { - { SeBackupPrivilege, 0 }, - { SeRestorePrivilege, 0 }, - }; - - if (!token || !token_check_privileges( token, TRUE, privs, - sizeof(privs)/sizeof(privs[0]), NULL )) + if (!thread_single_check_privilege( current, &SeRestorePrivilege )) { set_error( STATUS_PRIVILEGE_NOT_HELD ); return; @@ -2214,16 +2206,8 @@ DECL_HANDLER(load_registry) DECL_HANDLER(unload_registry) { struct key *key; - struct token *token = thread_get_impersonation_token( current ); - - const LUID_AND_ATTRIBUTES privs[] = - { - { SeBackupPrivilege, 0 }, - { SeRestorePrivilege, 0 }, - }; - if (!token || !token_check_privileges( token, TRUE, privs, - sizeof(privs)/sizeof(privs[0]), NULL )) + if (!thread_single_check_privilege( current, &SeRestorePrivilege )) { set_error( STATUS_PRIVILEGE_NOT_HELD ); return;

1 0

Nikolay Sivov : kernel32: Fix context initialization for EnumDateFormatsExEx.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: e528765af4a353b820ef390b7030173cbc451c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e528765af4a353b820ef390b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 16 01:10:04 2015 +0300 kernel32: Fix context initialization for EnumDateFormatsExEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 0985e35..c8a9746 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1916,6 +1916,7 @@ BOOL WINAPI EnumDateFormatsExEx(DATEFMT_ENUMPROCEXEX proc, const WCHAR *locale, ctxt.lcid = LocaleNameToLCID(locale, 0); ctxt.flags = flags; ctxt.lParam = lParam; + ctxt.unicode = TRUE; return NLS_EnumDateFormats(&ctxt); }

1 0

Hugh McMaster : cmd: Set colour attributes when clearing the screen with ' cls'.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: ca8b3843abc7407212ec83c2d70d7a09bbb70ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8b3843abc7407212ec83c2d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 16 11:53:06 2015 +1100 cmd: Set colour attributes when clearing the screen with 'cls'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e9b9ddd..22f0580 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -236,13 +236,14 @@ void WCMD_clear_screen (void) { if (GetConsoleScreenBufferInfo(hStdOut, &consoleInfo)) { COORD topLeft; - DWORD screenSize; + DWORD screenSize, written; screenSize = consoleInfo.dwSize.X * (consoleInfo.dwSize.Y + 1); topLeft.X = 0; topLeft.Y = 0; - FillConsoleOutputCharacterW(hStdOut, ' ', screenSize, topLeft, &screenSize); + FillConsoleOutputCharacterW(hStdOut, ' ', screenSize, topLeft, &written); + FillConsoleOutputAttribute(hStdOut, consoleInfo.wAttributes, screenSize, topLeft, &written); SetConsoleCursorPosition(hStdOut, topLeft); } }

1 0

Alexandre Julliard : winegcc: Disable setting image base address on Android.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: 097006b1466854fbd80af8d85a729d85ec52b163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097006b1466854fbd80af8d85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 23:30:10 2015 +0900 winegcc: Disable setting image base address on Android. The Android linker doesn't handle this correctly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.h | 7 ++++++- tools/winegcc/winegcc.c | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 789b4ea..536fb2d 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -42,7 +42,12 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS, PLATFORM_CYGWIN + PLATFORM_UNSPECIFIED, + PLATFORM_APPLE, + PLATFORM_ANDROID, + PLATFORM_SOLARIS, + PLATFORM_WINDOWS, + PLATFORM_CYGWIN }; void error(const char* s, ...) DECLSPEC_NORETURN; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ee5ac6b..c07243b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -171,6 +171,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "android", PLATFORM_ANDROID }, { "solaris", PLATFORM_SOLARIS }, { "cygwin", PLATFORM_CYGWIN }, { "mingw32", PLATFORM_WINDOWS }, @@ -229,6 +230,8 @@ static const enum target_cpu build_cpu = CPU_ARM64; #ifdef __APPLE__ static enum target_platform build_platform = PLATFORM_APPLE; +#elif defined(__ANDROID__) +static enum target_platform build_platform = PLATFORM_ANDROID; #elif defined(__sun) static enum target_platform build_platform = PLATFORM_SOLARIS; #elif defined(__CYGWIN__) @@ -384,6 +387,7 @@ static const strarray* get_lddllflags( const struct options *opts, const strarra } break; + case PLATFORM_ANDROID: case PLATFORM_SOLARIS: case PLATFORM_UNSPECIFIED: strarray_add( flags, "-shared" ); @@ -1121,6 +1125,9 @@ static void build(struct options* opts) strarray_add(tmp_files, mapfile); } break; + case PLATFORM_ANDROID: + /* not supported on Android */ + break; default: if (opts->image_base) {

1 0

Hugh McMaster : reg/tests: Fix the add empty type test.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: 9e4e1cf9be9dd1f71879bb85eb003b021c652096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4e1cf9be9dd1f71879bb85e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 16 11:53:07 2015 +1100 reg/tests: Fix the add empty type test. The exit code of this test will always be REG_EXIT_FAILURE, so the return code is neither broken nor todo_wine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2880d37..4981bdd 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -110,12 +110,7 @@ static void test_add(void) /* Test empty type */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v emptyType /t \"\" /d WineTest /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), - "got exit code %u\n", r); - if (r == REG_EXIT_SUCCESS) - todo_wine verify_reg(hkey, "emptyType", REG_SZ, "", 1, 0); - else - todo_wine win_skip("broken reg.exe detected\n"); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); /* Test input key formats */ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r);

1 0

Alexandre Julliard : winegcc: Force stack alignment on all x86 platforms.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: bf73faefc7eb67a4940d3b9179568942e48b47c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf73faefc7eb67a4940d3b917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 22:52:41 2015 +0900 winegcc: Force stack alignment on all x86 platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ad139f5..ee5ac6b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -548,47 +548,34 @@ static void compile(struct options* opts, const char* lang) if (gcc_defs) { - int fastcall_done = 0; - if (opts->target_cpu == CPU_x86_64) + switch (opts->target_cpu) { + case CPU_x86_64: strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D__cdecl=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_stdcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); - fastcall_done = 1; - } - else if (opts->target_platform == PLATFORM_APPLE) - { - /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ + break; + case CPU_x86: strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); - } - else if (opts->target_cpu == CPU_ARM || opts->target_cpu == CPU_ARM64) - { + strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); + strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + break; + case CPU_ARM: + case CPU_ARM64: + case CPU_POWERPC: strarray_add(comp_args, "-D__stdcall="); strarray_add(comp_args, "-D__cdecl="); strarray_add(comp_args, "-D_stdcall="); strarray_add(comp_args, "-D_cdecl="); strarray_add(comp_args, "-D__fastcall="); strarray_add(comp_args, "-D_fastcall="); - fastcall_done = 1; - } - else - { - strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__))"); - strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__))"); - strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__))"); - strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__))"); - } - - if (!fastcall_done) - { - strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + break; } strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))");

1 0

Nikolay Sivov : comctl32/tests: Enable visual tests in interactive mode, fix build failure.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: eb6a872273bec6ab5c81463d7655cb0cc2357bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6a872273bec6ab5c81463d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 15 15:54:01 2015 +0300 comctl32/tests: Enable visual tests in interactive mode, fix build failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 55 ++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 7e8108a..9941667 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -40,16 +40,6 @@ #include "wine/test.h" #include "v6util.h" -#undef VISIBLE - -#ifdef VISIBLE -#define WAIT Sleep (1000) -#define REDRAW(hwnd) RedrawWindow (hwnd, NULL, 0, RDW_UPDATENOW) -#else -#define WAIT -#define REDRAW(hwnd) -#endif - #define IMAGELIST_MAGIC (('L' << 8) | 'I') #include "pshpack2.h" @@ -79,6 +69,16 @@ static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static HINSTANCE hinst; +/* only used in interactive mode */ +static void force_redraw(HWND hwnd) +{ + if (!winetest_interactive) + return; + + RedrawWindow(hwnd, NULL, 0, RDW_UPDATENOW); + Sleep(1000); +} + /* These macros build cursor/bitmap data in 4x4 pixel blocks */ #define B(x,y) ((x?0xf0:0)|(y?0xf:0)) #define ROW1(a,b,c,d,e,f,g,h) B(a,b),B(c,d),B(e,f),B(g,h) @@ -161,11 +161,11 @@ static HWND create_a_window(void) CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, 0, hinst, 0); -#ifdef VISIBLE - ShowWindow (hWnd, SW_SHOW); -#endif - REDRAW(hWnd); - WAIT; + if (winetest_interactive) + { + ShowWindow (hWnd, SW_SHOW); + force_redraw (hWnd); + } return hWnd; } @@ -173,16 +173,15 @@ static HWND create_a_window(void) static HDC show_image(HWND hwnd, HIMAGELIST himl, int idx, int size, LPCSTR loc, BOOL clear) { - HDC hdc = NULL; -#ifdef VISIBLE - if (!himl) return NULL; + HDC hdc; + + if (!winetest_interactive || !himl) return NULL; - SetWindowText(hwnd, loc); + SetWindowTextA(hwnd, loc); hdc = GetDC(hwnd); ImageList_Draw(himl, idx, hdc, 0, 0, ILD_TRANSPARENT); - REDRAW(hwnd); - WAIT; + force_redraw(hwnd); if (clear) { @@ -190,12 +189,11 @@ static HDC show_image(HWND hwnd, HIMAGELIST himl, int idx, int size, ReleaseDC(hwnd, hdc); hdc = NULL; } -#endif /* VISIBLE */ + return hdc; } /* Useful for checking differences */ -#if 0 static void dump_bits(const BYTE *p, const BYTE *q, int size) { int i, j; @@ -216,18 +214,16 @@ static void dump_bits(const BYTE *p, const BYTE *q, int size) } printf("\n"); } -#endif static void check_bits(HWND hwnd, HIMAGELIST himl, int idx, int size, const BYTE *checkbits, LPCSTR loc) { -#ifdef VISIBLE BYTE bits[100*100/8]; COLORREF c; HDC hdc; int x, y, i = -1; - if (!himl) return; + if (!winetest_interactive || !himl) return; memset(bits, 0, sizeof(bits)); hdc = show_image(hwnd, himl, idx, size, loc, FALSE); @@ -250,7 +246,6 @@ static void check_bits(HWND hwnd, HIMAGELIST himl, int idx, int size, "%s: bits different\n", loc); if (memcmp(bits, checkbits, (size * size)/8)) dump_bits(bits, checkbits, size); -#endif /* VISIBLE */ } static void test_begindrag(void) @@ -503,8 +498,7 @@ static void test_DrawIndirect(void) ok(!pImageList_DrawIndirect(&imldp),"bad himl succeeded!\n"); imldp.himl = himl; - REDRAW(hwndfortest); - WAIT; + force_redraw(hwndfortest); imldp.fStyle = SRCCOPY; imldp.rgbBk = CLR_DEFAULT; @@ -1821,8 +1815,7 @@ if (0) imldp.hdcDst = hdc; imldp.himl = himl; - REDRAW(hwndfortest); - WAIT; + force_redraw(hwndfortest); imldp.fStyle = SRCCOPY; imldp.rgbBk = CLR_DEFAULT;

1 0