wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Alexandre Julliard : winegcc: Pass the C compiler name to winebuild.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 3987913453fc8c723068997f8af7c6a66f72f0c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3987913453fc8c723068997f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 12:30:21 2013 +0200 winegcc: Pass the C compiler name to winebuild. --- tools/winegcc/winegcc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 65f066c..89ea310 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -940,6 +940,7 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); + strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));

1 0

Alexandre Julliard : winebuild: Add an option to use the C compiler to assemble files.
by Alexandre Julliard 10 Jun '13

10 Jun '13

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 10 Jun '13

10 Jun '13

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 10 Jun '13

10 Jun '13

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

Dmitry Timoshkov : ole32/tests: Remove redundant code.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 289437dc4d79ce2433fda4547dd58a7bf644eeae URL: http://source.winehq.org/git/wine.git/?a=commit;h=289437dc4d79ce2433fda4547… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 10 17:52:10 2013 +0900 ole32/tests: Remove redundant code. --- dlls/ole32/tests/ole_server.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 303ec35..d6c5ccc 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -329,7 +329,7 @@ static HANDLE start_server(const char *argv0) PROCESS_INFORMATION pi; STARTUPINFO si; SECURITY_ATTRIBUTES sa; - char **argv, cmdline[MAX_PATH * 2]; + char cmdline[MAX_PATH * 2]; BOOL ret; memset(&si, 0, sizeof(si)); @@ -343,7 +343,6 @@ static HANDLE start_server(const char *argv0) sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; - winetest_get_mainargs(&argv); sprintf(cmdline, "\"%s\" ole_server -server", argv0); ret = CreateProcess(argv0, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); @@ -364,20 +363,13 @@ START_TEST(ole_server) HANDLE mapping, done_event, init_done_event, process; struct winetest_info *info; int argc; - char **argv, *argv0, *ext; + char **argv; mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_ole_server"); ok(mapping != 0, "CreateFileMapping failed\n"); info = MapViewOfFile(mapping, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 4096); argc = winetest_get_mainargs(&argv); - argv0 = strrchr(argv[0], '\\'); - if (!argv0) argv0 = strrchr(argv[0], '/'); - if (!argv0) argv0 = argv[0]; - else argv0++; - argv0 = strdup(argv0); - ext = strrchr(argv0, '.'); - if (ext && !lstrcmpi(ext, ".so")) *ext = 0; done_event = CreateEvent(NULL, TRUE, FALSE, "ole_server_done_event"); ok(done_event != 0, "CreateEvent error %d\n", GetLastError());

1 0

Marcus Meissner : user32/tests: Remove side effects from assert()s.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: b853ddc40b342e02d7cab7ade2c2c7e544b9935d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b853ddc40b342e02d7cab7ade… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 22:39:54 2013 +0200 user32/tests: Remove side effects from assert()s. --- dlls/user32/tests/win.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2d9faaa..abd7f8d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1523,10 +1523,14 @@ static void test_MDI_child_stack(HWND mdi_client) cs.style = 0; cs.lParam = (LPARAM)mdi_lParam_test_message; - assert(child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_1 != 0, "expected child_1 to be non NULL"); + child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_2 != 0, "expected child_2 to be non NULL"); + child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_3 != 0, "expected child_3 to be non NULL"); + child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_4 != 0, "expected child_4 to be non NULL"); stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); stack[1] = GetWindow(stack[0], GW_HWNDNEXT);

1 0

Marcus Meissner : oleaut32: Avoid memory leaking junk (Coverity).
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 0bd04d40cfcf1e2ce628285fd15d4881284f5fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd04d40cfcf1e2ce628285fd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 20:47:00 2013 +0200 oleaut32: Avoid memory leaking junk (Coverity). --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c2c3a63..024df0d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9771,6 +9771,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) FILE_ATTRIBUTE_NORMAL, 0); if (outfile == INVALID_HANDLE_VALUE){ WMSFT_free_file(&file); + heap_free(junk); return TYPE_E_IOERROR; } @@ -9778,10 +9779,12 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) if (!br) { WMSFT_free_file(&file); CloseHandle(outfile); + heap_free(junk); return TYPE_E_IOERROR; } br = WriteFile(outfile, junk, junk_size, &written, NULL); + heap_free(junk); if (!br) { WMSFT_free_file(&file); CloseHandle(outfile);

1 0

Marcus Meissner : oleaut32: Fixed incorrect pointer deref (Coverity).
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: b22dade1d634c9a3843780af9755617fa6409430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22dade1d634c9a3843780af9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 20:44:19 2013 +0200 oleaut32: Fixed incorrect pointer deref (Coverity). --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ad0b4ae..c2c3a63 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3506,7 +3506,7 @@ static WORD SLTG_ReadString(const char *ptr, const TLBString **pStr, ITypeLibImp len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, NULL, 0); tmp_str = SysAllocStringLen(NULL, len); - if (*tmp_str) { + if (tmp_str) { MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, tmp_str, len); *pStr = TLB_append_str(&lib->string_list, tmp_str); SysFreeString(tmp_str);

1 0

Marcus Meissner : explorer: Fixed wrong heapalloc size (Coverity).
by Alexandre Julliard 10 Jun '13

10 Jun '13

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

Daniel Jelinski : msi: Update LastSequence for empty media as well.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: a2307a3339ddc630cfc249bc34b834aec8334f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2307a3339ddc630cfc249bc3… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jun 8 22:22:19 2013 +0200 msi: Update LastSequence for empty media as well. --- dlls/msi/patch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index d97ab2e..d7eef7c 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -551,7 +551,6 @@ static UINT set_patch_offsets( MSIDATABASE *db ) pos = patch_offset_list_create(); patch_offset_get_files( db, last_sequence, pos ); patch_offset_get_patches( db, last_sequence, pos ); - if (pos->count) { UINT offset = db->media_transform_offset - pos->min; last_sequence = offset + pos->max; @@ -559,7 +558,8 @@ static UINT set_patch_offsets( MSIDATABASE *db ) /* FIXME: this is for the patch table, which is not yet properly transformed */ last_sequence += pos->min; pos->offset_to_apply = offset; - patch_offset_modify_db( db, pos ); + if (pos->count) + patch_offset_modify_db( db, pos ); MSI_RecordSetInteger( rec, 2, last_sequence ); r = MSI_ViewModify( view, MSIMODIFY_UPDATE, rec );

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013