June 2013 - Wine-Commits - list.winehq.org

Hans Leidekker : msi/tests: Move some tests around to avoid timeouts on the testbot.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: b82a5ab27a19d605f1957be82808673aede809eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82a5ab27a19d605f1957be82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 10 18:58:30 2013 +0200 msi/tests: Move some tests around to avoid timeouts on the testbot. --- dlls/msi/tests/install.c | 565 +--------------------------- dlls/msi/tests/msi.c | 968 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 968 insertions(+), 565 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b82a5ab27a19d605f1957…

1 0

Hans Leidekker : winhttp/tests: Trace certificate errors.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 4df4339f8ea82edf360dadb04b7cd2ab68d543c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df4339f8ea82edf360dadb04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 10 14:24:25 2013 +0200 winhttp/tests: Trace certificate errors. --- dlls/winhttp/tests/winhttp.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 03de012..1aff505 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -789,6 +789,26 @@ static void test_WinHttpAddHeaders(void) } +static void CALLBACK cert_error(HINTERNET handle, DWORD_PTR ctx, DWORD status, LPVOID buf, DWORD len) +{ + DWORD flags = *(DWORD *)buf; + + if (!flags) + { + trace("WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR\n"); + return; + } +#define X(x) if (flags & x) trace("%s\n", #x); + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED) + X(WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED) + X(WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE) +#undef X +} + static void test_secure_connection(void) { static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; @@ -834,6 +854,8 @@ static void test_secure_connection(void) req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); if (!ret)

1 0

Jacek Caban : d3d9.h: Make include guard compatible with PSDK headers.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: a8535c3b23b4d645ccc7b1de7a643f2707f978dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8535c3b23b4d645ccc7b1de7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 10 11:56:18 2013 +0200 d3d9.h: Make include guard compatible with PSDK headers. --- include/d3d9.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 0f52d09..382b241 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_D3D9_H -#define __WINE_D3D9_H +#ifndef _D3D9_H_ +#define _D3D9_H_ #ifndef DIRECT3D_VERSION #define DIRECT3D_VERSION 0x0900 @@ -2042,4 +2042,4 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion); #endif /* defined(__cplusplus) */ -#endif /* __WINE_D3D9_H */ +#endif /* _D3D9_H_ */

1 0

Austin English : api-ms-win-core-processthreads-l1-1-0: Add stub dll.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 936cb4ce7e14e9dbcdf1ff2fa8ca65ceed7b33ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=936cb4ce7e14e9dbcdf1ff2fa… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jun 8 16:27:40 2013 -0500 api-ms-win-core-processthreads-l1-1-0: Add stub dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-core-processthreads-l1-1-0.spec | 49 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3a551e8..3006070 100755 --- a/configure +++ b/configure @@ -15751,6 +15751,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 +wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 57d76d9..680432c 100644 --- a/configure.ac +++ b/configure.ac @@ -2575,6 +2575,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in new file mode 100644 index 0000000..e516731 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-processthreads-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec new file mode 100644 index 0000000..0b16649 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -0,0 +1,49 @@ +@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA +@ stub CreateProcessAsUserW +@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW +@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread +@ stub CreateRemoteThreadEx +@ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread +@ stub DeleteProcThreadAttributeList +@ stdcall ExitProcess(long) kernel32.ExitProcess +@ stdcall ExitThread(long) kernel32.ExitThread +@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess +@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId +@ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread +@ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId +@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess +@ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread +@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass +@ stdcall GetProcessId(long) kernel32.GetProcessId +@ stub GetProcessIdOfThread +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW +@ stdcall GetThreadId(ptr) kernel32.GetThreadId +@ stdcall GetThreadPriority(long) kernel32.GetThreadPriority +@ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost +@ stub InitializeProcThreadAttributeList +@ stub OpenProcessToken +@ stdcall OpenThread(long long long) kernel32.OpenThread +@ stub OpenThreadToken +@ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId +@ stub QueryProcessAffinityUpdateMode +@ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC +@ stdcall ResumeThread(long) kernel32.ResumeThread +@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass +@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters +@ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority +@ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost +@ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee +@ stub SetThreadToken +@ stdcall SuspendThread(long) kernel32.SuspendThread +@ stdcall SwitchToThread() kernel32.SwitchToThread +@ stdcall TerminateProcess(long long) kernel32.TerminateProcess +@ stdcall TerminateThread(long long) kernel32.TerminateThread +@ stdcall TlsAlloc() kernel32.TlsAlloc +@ stdcall TlsFree(long) kernel32.TlsFree +@ stdcall TlsGetValue(long) kernel32.TlsGetValue +@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue +@ stub UpdateProcThreadAttribute diff --git a/tools/make_specfiles b/tools/make_specfiles index 002d252..1a57692 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -128,6 +128,7 @@ my @dll_groups = [ "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", + "api-ms-win-core-processthreads-l1-1-0", ], [ "ole32",

1 0

Nozomi Kodama : d3dx9: Fix the case output = input in D3DXVec3Cross.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: b3dff5b3543e13962f3dde5a59738933b63c7ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dff5b3543e13962f3dde5a5… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sat Jun 8 02:26:45 2013 -1000 d3dx9: Fix the case output = input in D3DXVec3Cross. --- dlls/d3dx9_36/tests/math.c | 3 +++ include/d3dx9math.inl | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9d90662..5f92729 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1251,6 +1251,9 @@ static void D3DXVector3Test(void) expectedvec.x = -18.0f; expectedvec.y = 40.0f; expectedvec.z = -39.0f; D3DXVec3Cross(&gotvec,&u,&v); expect_vec3(expectedvec,gotvec); + expectedvec.x = -277.0f; expectedvec.y = -150.0f; expectedvec.z = -26.0f; + D3DXVec3Cross(&gotvec,&gotvec,&v); + expect_vec3(expectedvec,gotvec); /* Tests the case NULL */ funcpointer = D3DXVec3Cross(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index 5ee9a75..84c0c62 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -1029,10 +1029,13 @@ static inline D3DXVECTOR3* D3DXVec3Add(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1 static inline D3DXVECTOR3* D3DXVec3Cross(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { + D3DXVECTOR3 temp; + if ( !pout || !pv1 || !pv2) return NULL; - pout->x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y); - pout->y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z); - pout->z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x); + temp.x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y); + temp.y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z); + temp.z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x); + *pout = temp; return pout; }

1 0

Alexandre Julliard : winebuild: Add an option to use the C compiler to assemble files.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 98e6a0da73ef87dacdcf0bcf0ca58c0091799968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e6a0da73ef87dacdcf0bcf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 13:19:29 2013 +0200 winebuild: Add an option to use the C compiler to assemble files. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 +++++++ tools/winebuild/utils.c | 18 +++++++----------- tools/winebuild/winebuild.man.in | 4 ++++ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e943762..fa92764 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -358,6 +358,7 @@ extern const char *output_file_name; extern char **lib_path; extern struct strarray *as_command; +extern struct strarray *cc_command; extern struct strarray *ld_command; extern struct strarray *nm_command; extern char *cpu_option; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index de526a9..a848a0c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -85,6 +85,7 @@ static const char *output_file_source_name; static int fake_module; struct strarray *as_command = NULL; +struct strarray *cc_command = NULL; struct strarray *ld_command = NULL; struct strarray *nm_command = NULL; char *cpu_option = NULL; @@ -241,6 +242,7 @@ static const char usage_str[] = "Options:\n" " --as-cmd=AS Command to use for assembling (default: as)\n" " -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" +" --cc-cmd=CC C compiler to use for assembling (default: fall back to --as-cmd)\n" " -d, --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" " -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" @@ -286,6 +288,7 @@ enum long_options_values LONG_OPT_EXE, LONG_OPT_IMPLIB, LONG_OPT_ASCMD, + LONG_OPT_CCCMD, LONG_OPT_EXTERNAL_SYMS, LONG_OPT_FAKE_MODULE, LONG_OPT_LARGE_ADDRESS_AWARE, @@ -307,6 +310,7 @@ static const struct option long_options[] = { "exe", 0, 0, LONG_OPT_EXE }, { "implib", 0, 0, LONG_OPT_IMPLIB }, { "as-cmd", 1, 0, LONG_OPT_ASCMD }, + { "cc-cmd", 1, 0, LONG_OPT_CCCMD }, { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, { "fake-module", 0, 0, LONG_OPT_FAKE_MODULE }, { "large-address-aware", 0, 0, LONG_OPT_LARGE_ADDRESS_AWARE }, @@ -476,6 +480,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_ASCMD: as_command = strarray_fromstring( optarg, " " ); break; + case LONG_OPT_CCCMD: + cc_command = strarray_fromstring( optarg, " " ); + break; case LONG_OPT_FAKE_MODULE: fake_module = 1; break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d064572..2028b05 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -373,13 +373,15 @@ struct strarray *find_tool( const char *name, const char * const *names ) struct strarray *get_as_command(void) { - static int as_is_clang = 0; struct strarray *args; - if (!as_command) + if (cc_command) { - as_command = find_tool( "clang", NULL ); - if (as_command) as_is_clang = 1; + args = strarray_copy( cc_command ); + strarray_add( args, "-xassembler", "-c", NULL ); + if (force_pointer_size) + strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); + return args; } if (!as_command) @@ -393,13 +395,7 @@ struct strarray *get_as_command(void) args = strarray_copy( as_command ); - if (as_is_clang) - { - strarray_add( args, "-xassembler", "-c", NULL ); - if (force_pointer_size) - strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); - } - else if (force_pointer_size) + if (force_pointer_size) { switch (target_platform) { diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 59debd4..3762b74 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -67,6 +67,10 @@ Specify the target CPU and platform on which the generated code will be built. The target specification is in the standard autoconf format as returned by config.sub. .TP +.BI \--cc-cmd= cc-command +Specify the C compiler to use to compile assembly files; the default +is to instead use the assembler specified with \fB--as-cmd\fR. +.TP .BI \-d,\ --delay-lib= name Set the delayed import mode for the specified library, which must be one of the libraries imported with the \fB-l\fR option. Delayed mode

1 0

Alexandre Julliard : winebuild: Split the names of the as and ld commands to allow arguments.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: f7272176d9e74f8f645572bd3a36f6a452eaf460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7272176d9e74f8f645572bd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 13:17:21 2013 +0200 winebuild: Split the names of the as and ld commands to allow arguments. --- tools/winebuild/build.h | 10 +++++----- tools/winebuild/import.c | 9 +++++---- tools/winebuild/main.c | 12 ++++++------ tools/winebuild/res32.c | 4 ++-- tools/winebuild/utils.c | 43 +++++++++++++++++++++++++++++++++++-------- 5 files changed, 53 insertions(+), 25 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 08b0004..e943762 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -229,7 +229,7 @@ extern char *xstrdup( const char *str ); extern char *strupper(char *s); extern int strendswith(const char* str, const char* end); extern char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); -extern struct strarray *strarray_init(void); +extern struct strarray *strarray_fromstring( const char *str, const char *delim ); extern void strarray_add( struct strarray *array, ... ); extern void strarray_addv( struct strarray *array, char * const *argv ); extern void strarray_free( struct strarray *array ); @@ -246,7 +246,7 @@ extern int output( const char *format, ... ) extern void output_cfi( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void spawn( struct strarray *array ); -extern char *find_tool( const char *name, const char * const *names ); +extern struct strarray *find_tool( const char *name, const char * const *names ); extern struct strarray *get_as_command(void); extern struct strarray *get_ld_command(void); extern const char *get_nm_command(void); @@ -357,9 +357,9 @@ extern FILE *output_file; extern const char *output_file_name; extern char **lib_path; -extern char *as_command; -extern char *ld_command; -extern char *nm_command; +extern struct strarray *as_command; +extern struct strarray *ld_command; +extern struct strarray *nm_command; extern char *cpu_option; #endif /* __WINE_BUILD_H */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f533989..f8de47e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1322,7 +1322,7 @@ void output_imports( DLLSPEC *spec ) /* output an import library for a Win32 module and additional object files */ void output_import_lib( DLLSPEC *spec, char **argv ) { - struct strarray *args = strarray_init(); + struct strarray *args; char *def_file; if (target_platform != PLATFORM_WINDOWS) @@ -1336,14 +1336,15 @@ void output_import_lib( DLLSPEC *spec, char **argv ) fclose( output_file ); output_file = NULL; - strarray_add( args, find_tool( "dlltool", NULL ), "-k", "-l", output_file_name, "-d", def_file, NULL ); + args = find_tool( "dlltool", NULL ); + strarray_add( args, "-k", "-l", output_file_name, "-d", def_file, NULL ); spawn( args ); strarray_free( args ); if (argv[0]) { - args = strarray_init(); - strarray_add( args, find_tool( "ar", NULL ), "rs", output_file_name, NULL ); + args = find_tool( "ar", NULL ); + strarray_add( args, "rs", output_file_name, NULL ); strarray_addv( args, argv ); spawn( args ); strarray_free( args ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 16b4165..de526a9 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -84,9 +84,9 @@ const char *output_file_name = NULL; static const char *output_file_source_name; static int fake_module; -char *as_command = NULL; -char *ld_command = NULL; -char *nm_command = NULL; +struct strarray *as_command = NULL; +struct strarray *ld_command = NULL; +struct strarray *nm_command = NULL; char *cpu_option = NULL; static int nb_res_files; @@ -474,7 +474,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) set_exec_mode( MODE_IMPLIB ); break; case LONG_OPT_ASCMD: - as_command = xstrdup( optarg ); + as_command = strarray_fromstring( optarg, " " ); break; case LONG_OPT_FAKE_MODULE: fake_module = 1; @@ -486,10 +486,10 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; break; case LONG_OPT_LDCMD: - ld_command = xstrdup( optarg ); + ld_command = strarray_fromstring( optarg, " " ); break; case LONG_OPT_NMCMD: - nm_command = xstrdup( optarg ); + nm_command = strarray_fromstring( optarg, " " ); break; case LONG_OPT_NXCOMPAT: if (optarg[0] == 'n' || optarg[0] == 'N') diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index bd3f6fa..0c39ec1 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -680,8 +680,8 @@ void output_res_o_file( DLLSPEC *spec ) close( fd ); free( output_buffer ); - args = strarray_init(); - strarray_add( args, find_tool( "windres", NULL ), "-i", res_file, "-o", output_file_name, NULL ); + args = find_tool( "windres", NULL ); + strarray_add( args, "-i", res_file, "-o", output_file_name, NULL ); spawn( args ); strarray_free( args ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1c77e41..d064572 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -138,12 +138,23 @@ char *strmake( const char* fmt, ... ) } } -struct strarray *strarray_init(void) +static struct strarray *strarray_init( const char *str ) { struct strarray *array = xmalloc( sizeof(*array) ); array->count = 0; array->max = 16; array->str = xmalloc( array->max * sizeof(*array->str) ); + if (str) array->str[array->count++] = str; + return array; +} + +static struct strarray *strarray_copy( const struct strarray *src ) +{ + struct strarray *array = xmalloc( sizeof(*array) ); + array->count = src->count; + array->max = src->max; + array->str = xmalloc( array->max * sizeof(*array->str) ); + memcpy( array->str, src->str, array->count * sizeof(*array->str) ); return array; } @@ -172,6 +183,19 @@ void strarray_addv( struct strarray *array, char * const *argv ) while (*argv) strarray_add_one( array, *argv++ ); } +struct strarray *strarray_fromstring( const char *str, const char *delim ) +{ + const char *tok; + struct strarray *array = strarray_init( NULL ); + char *buf = strdup( str ); + + for (tok = strtok( buf, delim ); tok; tok = strtok( NULL, delim )) + strarray_add_one( array, strdup( tok )); + + free( buf ); + return array; +} + void strarray_free( struct strarray *array ) { free( array->str ); @@ -277,7 +301,7 @@ void spawn( struct strarray *args ) } /* find a build tool in the path, trying the various names */ -char *find_tool( const char *name, const char * const *names ) +struct strarray *find_tool( const char *name, const char * const *names ) { static char **dirs; static unsigned int count, maxlen; @@ -338,7 +362,8 @@ char *find_tool( const char *name, const char * const *names ) strcpy( p, *names ); strcat( p, EXEEXT ); - if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) return file; + if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) + return strarray_init( file ); } free( file ); names++; @@ -349,7 +374,7 @@ char *find_tool( const char *name, const char * const *names ) struct strarray *get_as_command(void) { static int as_is_clang = 0; - struct strarray *args = strarray_init(); + struct strarray *args; if (!as_command) { @@ -366,7 +391,7 @@ struct strarray *get_as_command(void) if (!as_command) fatal_error( "cannot find suitable assembler\n" ); - strarray_add_one( args, as_command ); + args = strarray_copy( as_command ); if (as_is_clang) { @@ -401,7 +426,7 @@ struct strarray *get_as_command(void) struct strarray *get_ld_command(void) { - struct strarray *args = strarray_init(); + struct strarray *args; if (!ld_command) { @@ -412,7 +437,7 @@ struct strarray *get_ld_command(void) if (!ld_command) fatal_error( "cannot find suitable linker\n" ); - strarray_add_one( args, ld_command ); + args = strarray_copy( ld_command ); if (force_pointer_size) { @@ -450,7 +475,9 @@ const char *get_nm_command(void) if (!nm_command) fatal_error( "cannot find suitable name lister\n" ); - return nm_command; + if (nm_command->count > 1) + fatal_error( "multiple arguemnts in nm command not supported yet\n" ); + return nm_command->str[0]; } /* get a name for a temp file, automatically cleaned up on exit */

1 0

Dmitry Timoshkov : ole32/tests: Add a test for local server interaction using an in-process handler.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 2daa5367f8654a2d4d889dd834cb73e04255c22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daa5367f8654a2d4d889dd83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 10 17:52:59 2013 +0900 ole32/tests: Add a test for local server interaction using an in-process handler. --- dlls/ole32/tests/ole_server.c | 92 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 85 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index d6c5ccc..9cff693 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -55,6 +55,7 @@ static const struct GUID_NAME(IStdMarshalInfo), GUID_NAME(IExternalConnection), GUID_NAME(IRunnableObject), + GUID_NAME(ICallFactory), { &CLSID_IdentityUnmarshal, "CLSID_IdentityUnmarshal" }, { &CLSID_UnknownUnmarshal, "CLSID_UnknownUnmarshal" }, #undef GUID_NAME @@ -276,7 +277,7 @@ static void ole_server(void) } /******************************* OLE client *******************************/ -static BOOL register_server(const char *server) +static BOOL register_server(const char *server, BOOL inproc_handler) { static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; DWORD ret; @@ -296,6 +297,13 @@ static BOOL register_server(const char *server) { ret = RegSetValue(root, "LocalServer32", REG_SZ, server_path, strlen(server_path)); ok(ret == ERROR_SUCCESS, "RegSetValue error %u\n", ret); + + if (inproc_handler) + { + ret = RegSetValue(root, "InprocHandler32", REG_SZ, "ole32.dll", 9); + ok(ret == ERROR_SUCCESS, "RegSetValue error %u\n", ret); + } + RegCloseKey(root); } @@ -316,6 +324,8 @@ static void unregister_server(void) DELETE, NULL, &root, NULL); if (ret == ERROR_SUCCESS) { + ret = RegDeleteKey(root, "InprocHandler32"); + ok(ret == ERROR_SUCCESS, "RegDeleteKey error %u\n", ret); ret = RegDeleteKey(root, "LocalServer32"); ok(ret == ERROR_SUCCESS, "RegDeleteKey error %u\n", ret); ret = RegDeleteKey(root, ""); @@ -359,6 +369,7 @@ START_TEST(ole_server) IClassFactory *factory; IUnknown *unknown; IOleObject *oleobj; + IRunnableObject *runobj; DWORD ret; HANDLE mapping, done_event, init_done_event, process; struct winetest_info *info; @@ -396,7 +407,7 @@ START_TEST(ole_server) return; } - if (!register_server(argv[0])) + if (!register_server(argv[0], FALSE)) { win_skip("not enough permissions to create a server CLSID key\n"); return; @@ -415,14 +426,81 @@ START_TEST(ole_server) hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&unknown); ok(hr == REGDB_E_CLASSNOTREG, "expected REGDB_E_CLASSNOTREG, got %#x\n", hr); - /* server supports IID_IUnknown */ + if (!register_server(argv[0], TRUE)) + { + win_skip("not enough permissions to create a server CLSID key\n"); + unregister_server(); + return; + } + + trace("call CoCreateInstance(&IID_NULL)\n"); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_NULL, (void **)&unknown); + trace("ret CoCreateInstance(&IID_NULL)\n"); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + + /* in-process handler supports IID_IUnknown starting from Vista */ + trace("call CoCreateInstance(&IID_IUnknown)\n"); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&unknown); + trace("ret CoCreateInstance(&IID_IUnknown)\n"); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* XP,win2000 and earlier */, "CoCreateInstance(IID_IUnknown) error %#x\n", hr); + if (hr != S_OK) + { + win_skip("In-process handler doesn't support IID_IUnknown on this platform\n"); + goto test_local_server; + } + + trace("call CoCreateInstance(&IID_IOleObject)\n"); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_IOleObject, (void **)&oleobj); + trace("ret CoCreateInstance(&IID_IOleObject)\n"); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + + trace("call IUnknown_QueryInterface(&IID_IRunnableObject)\n"); + hr = IUnknown_QueryInterface(unknown, &IID_IRunnableObject, (void **)&runobj); + trace("ret IUnknown_QueryInterface(&IID_IRunnableObject)\n"); + ok(hr == S_OK, "QueryInterface(&IID_IRunnableObject) error %#x\n", hr); + + ret = IRunnableObject_IsRunning(runobj); + ok(!ret, "expected 0, got %d\n", ret); + + trace("call OleRun\n"); + hr = OleRun(unknown); + trace("ret OleRun\n"); +todo_wine + ok(hr == S_OK, "OleRun error %#x\n", hr); + + ret = IRunnableObject_IsRunning(runobj); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); + + trace("call IRunnableObject_Release\n"); + ret = IRunnableObject_Release(runobj); + trace("ret IRunnableObject_Release\n"); + ok(ret == 1, "expected ref 1, got %u\n", ret); + + trace("call IUnknown_QueryInterface(&IID_IOleObject)\n"); + hr = IUnknown_QueryInterface(unknown, &IID_IOleObject, (void **)&oleobj); + trace("ret IUnknown_QueryInterface(&IID_IOleObject)\n"); + ok(hr == S_OK, "QueryInterface(&IID_IOleObject) error %#x\n", hr); + + trace("call IOleObject_Release\n"); + ret = IOleObject_Release(oleobj); + trace("ret IOleObject_Release\n"); + ok(ret == 1, "expected ref 1, got %u\n", ret); + + trace("call IUnknown_Release\n"); + ret = IUnknown_Release(unknown); + trace("ret IUnknown_Release\n"); + ok(!ret, "expected ref 0, got %u\n", ret); + +test_local_server: + /* local server supports IID_IUnknown */ trace("call CoCreateInstance(&IID_IUnknown)\n"); hr = CoCreateInstance(&clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_IUnknown, (void **)&unknown); trace("ret CoCreateInstance(&IID_IUnknown)\n"); ok(hr == S_OK, "CoCreateInstance(IID_IUnknown) error %#x\n", hr); trace("call IUnknown_QueryInterface(&IID_IRunnableObject)\n"); - hr = IUnknown_QueryInterface(unknown, &IID_IRunnableObject, (void **)&oleobj); + hr = IUnknown_QueryInterface(unknown, &IID_IRunnableObject, (void **)&runobj); trace("ret IUnknown_QueryInterface(&IID_IRunnableObject)\n"); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); @@ -446,9 +524,9 @@ START_TEST(ole_server) trace("ret CoGetClassObject(&IID_IClassFactory)\n"); ok(hr == S_OK, "CoGetClassObject error %#x\n", hr); - trace("call IClassFactory_QueryInterface(&IID_IOleObject)\n"); - hr = IClassFactory_QueryInterface(factory, &IID_IOleObject, (void **)&oleobj); - trace("ret IClassFactory_QueryInterface(&IID_IOleObject)\n"); + trace("call IClassFactory_CreateInstance(&IID_NULL)\n"); + hr = IClassFactory_CreateInstance(factory, NULL, &IID_NULL, (void **)&oleobj); + trace("ret IClassFactory_CreateInstance(&IID_NULL)\n"); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); trace("call IClassFactory_CreateInstance(&IID_IOleObject)\n");

1 0

Marcus Meissner : explorer: Fixed wrong heapalloc size (Coverity).
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 9a336ce3e74f8ba8e51cf7339274cac06af041da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a336ce3e74f8ba8e51cf7339… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 20:30:23 2013 +0200 explorer: Fixed wrong heapalloc size (Coverity). --- programs/explorer/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 33b58dc..5503787 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -457,7 +457,7 @@ static void initialize_launchers( HWND hwnd ) CoTaskMemFree( desktop_folder ); return; } - if ((launchers = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(struct launcher) ))) + if ((launchers = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(launchers[0]) ))) { nb_allocated = 2;

1 0

André Hentschel : ws2_32/tests: Don' t test functions directly when reporting WSAGetLastError().
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 749bb1db3594b300fccf78953ba325e9b9c786b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749bb1db3594b300fccf78953… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 8 14:41:22 2013 +0200 ws2_32/tests: Don't test functions directly when reporting WSAGetLastError(). --- dlls/ws2_32/tests/sock.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ff0d538..758fa7e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3571,7 +3571,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); src2 = socket(AF_INET, SOCK_STREAM, 0); if (src2 == INVALID_SOCKET) @@ -3580,7 +3581,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); len = sizeof(BOOL); if (getsockopt(src, SOL_SOCKET, SO_OOBINLINE, (void *)&bret, &len) == SOCKET_ERROR) @@ -4013,7 +4015,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, 0); if (ret) @@ -4022,7 +4025,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); } else { @@ -4033,7 +4037,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); ret = WSAEventSelect(src2, hEvent2, 0); if (ret) @@ -4042,7 +4047,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); } end:

1 0