February 2014 - Wine-commits

Jacek Caban : shell32/tests: Ensure that tmpdir contains long path name.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: wine Branch: master Commit: cf2098cf2d0f7d7d824589aed82fab74720e6c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2098cf2d0f7d7d824589aed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 19 11:53:21 2014 +0100 shell32/tests: Ensure that tmpdir contains long path name. --- dlls/shell32/tests/shlexec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 10c341f..418b73a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2540,6 +2540,7 @@ static void init_test(void) GetTempPathA(sizeof(filename), filename); GetTempFileNameA(filename, "wt", 0, tmpdir); + GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL ); ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() );

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 19 Feb '14

19 Feb '14

Module: bugzilla Branch: master Commit: 1f26103c851fd802e9401ace3bf9fba5aa046140 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=1f26103c851fd802e9401… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 19 13:19:02 2014 +0100 Merge branch 'upstream'. Conflicts: template/en/default/account/create.html.tmpl template/en/default/bug/create/user-message.html.tmpl template/en/default/global/common-links.html.tmpl ---

1 0

Frédéric Delanoy : winhlp32: Use BOOL type where appropriate.
by Alexandre Julliard 18 Feb '14

18 Feb '14

Module: wine Branch: master Commit: 33cb4f80b7772bebf29793c6d2dac3029b66440a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cb4f80b7772bebf29793c6d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 18 10:58:40 2014 +0100 winhlp32: Use BOOL type where appropriate. --- programs/winhlp32/macro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 615b687..3b89e03 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -804,7 +804,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR else MACRO_Loaded = HeapReAlloc(GetProcessHeap(), 0, MACRO_Loaded, size); MACRO_Loaded[MACRO_NumLoaded - 1].name = StrDup(proc); /* FIXME: never freed */ MACRO_Loaded[MACRO_NumLoaded - 1].alias = NULL; - MACRO_Loaded[MACRO_NumLoaded - 1].isBool = 0; + MACRO_Loaded[MACRO_NumLoaded - 1].isBool = FALSE; MACRO_Loaded[MACRO_NumLoaded - 1].arguments = StrDup(args); /* FIXME: never freed */ MACRO_Loaded[MACRO_NumLoaded - 1].fn = fn; WINE_TRACE("Added %s(%s) at %p\n", proc, args, fn);

1 0

Jacek Caban : vbscript: Skip tests if we can't register ActiveX object.
by Alexandre Julliard 18 Feb '14

18 Feb '14

Module: wine Branch: master Commit: 48111d1c15c6424b1a82660659303dd98d4e7cb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48111d1c15c6424b1a8266065… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 18 11:32:53 2014 +0100 vbscript: Skip tests if we can't register ActiveX object. --- dlls/vbscript/tests/createobj.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 729fa3e..002f12f 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -1092,12 +1092,13 @@ START_TEST(createobj) CoInitialize(NULL); if(check_vbscript()) { - register_activex(); - - test_CreateObject(); - test_GetObject(); - - init_registry(FALSE); + if(register_activex()) { + test_CreateObject(); + test_GetObject(); + init_registry(FALSE); + }else { + skip("Could not register ActiveX object.\n"); + } }else { win_skip("Broken engine, probably too old\n"); }

1 0

Jacek Caban : wscript: Skip tests if we can't register ActiveX object.
by Alexandre Julliard 18 Feb '14

18 Feb '14

Module: wine Branch: master Commit: 59c934aadc31fafc37489317a879d5166371baa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c934aadc31fafc37489317a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 18 11:33:02 2014 +0100 wscript: Skip tests if we can't register ActiveX object. --- programs/wscript/tests/run.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 75d8f6e..e74e3d8 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -460,7 +460,12 @@ START_TEST(run) int argc; CoInitializeEx(NULL, COINIT_MULTITHREADED); - register_activex(); + + if(!register_activex()) { + skip("Could not register ActiveX object.\n"); + CoUninitialize(); + return; + } argc = winetest_get_mainargs(&argv); if(argc > 2)

1 0

Alistair Leslie-Hughes : dpnsvr.exe: New stub program.
by Alexandre Julliard 18 Feb '14

18 Feb '14

Module: wine Branch: master Commit: e01f7fee0b47a04501dcb035ae24a91e4853abff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01f7fee0b47a04501dcb035a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 7 10:24:06 2014 +1100 dpnsvr.exe: New stub program. --- configure | 2 ++ configure.ac | 1 + programs/dpnsvr/Makefile.in | 5 +++++ programs/dpnsvr/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index 00c4420..9ba1adb 100755 --- a/configure +++ b/configure @@ -1308,6 +1308,7 @@ enable_cmd enable_conhost enable_control enable_cscript +enable_dpnsvr enable_dxdiag enable_eject enable_expand @@ -17284,6 +17285,7 @@ wine_fn_config_test programs/cmd/tests cmd.exe_test wine_fn_config_program conhost enable_conhost install wine_fn_config_program control enable_control install wine_fn_config_program cscript enable_cscript install +wine_fn_config_program dpnsvr enable_dpnsvr install wine_fn_config_program dxdiag enable_dxdiag install,po wine_fn_config_program eject enable_eject install wine_fn_config_program expand enable_expand install diff --git a/configure.ac b/configure.ac index 9811873..224b8c5 100644 --- a/configure.ac +++ b/configure.ac @@ -3293,6 +3293,7 @@ WINE_CONFIG_TEST(programs/cmd/tests) WINE_CONFIG_PROGRAM(conhost,,[install]) WINE_CONFIG_PROGRAM(control,,[install]) WINE_CONFIG_PROGRAM(cscript,,[install]) +WINE_CONFIG_PROGRAM(dpnsvr,,[install]) WINE_CONFIG_PROGRAM(dxdiag,,[install,po]) WINE_CONFIG_PROGRAM(eject,,[install]) WINE_CONFIG_PROGRAM(expand,,[install]) diff --git a/programs/dpnsvr/Makefile.in b/programs/dpnsvr/Makefile.in new file mode 100644 index 0000000..1dac8a4 --- /dev/null +++ b/programs/dpnsvr/Makefile.in @@ -0,0 +1,5 @@ +MODULE = dpnsvr.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/dpnsvr/main.c b/programs/dpnsvr/main.c new file mode 100644 index 0000000..6041cbc --- /dev/null +++ b/programs/dpnsvr/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpnsvr); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Alexandre Julliard : makedep: Only add global includes to the include paths when generating the makefile.
by Alexandre Julliard 18 Feb '14

18 Feb '14

Module: wine Branch: master Commit: 50a01b095e35230a3822bb30234d6f86c2ac8467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a01b095e35230a3822bb302… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 15 10:44:31 2014 +0100 makedep: Only add global includes to the include paths when generating the makefile. --- tools/makedep.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 171e609..6ad2ade 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -114,6 +114,7 @@ static const char *Separator = "### Dependencies"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; +static int use_msvcrt; static int relative_dir_mode; static int input_line; static int output_column; @@ -791,6 +792,18 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } + /* check in global includes source dir */ + + filename = top_dir_path( strmake( "include/%s", pFile->name )); + if ((file = open_file( filename ))) goto found; + + /* check in global msvcrt includes */ + if (use_msvcrt) + { + filename = top_dir_path( strmake( "include/msvcrt/%s", pFile->name )); + if ((file = open_file( filename ))) goto found; + } + /* now search in include paths */ for (i = 0; i < include_args.count; i++) { @@ -1482,7 +1495,9 @@ static struct strarray output_sources(void) strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); if (parent_dir) strarray_add( &includes, strmake( "-I%s", src_dir_path( parent_dir ))); - if (top_src_dir && top_obj_dir) strarray_add( &includes, strmake( "-I%s/include", top_obj_dir )); + if (top_obj_dir) strarray_add( &includes, strmake( "-I%s/include", top_obj_dir )); + if (top_src_dir) strarray_add( &includes, strmake( "-I%s/include", top_src_dir )); + if (use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( "include/msvcrt" ))); strarray_addall( &includes, include_args ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) @@ -2274,7 +2289,6 @@ static void update_makefile( const char *path ) }; const char **var; unsigned int i; - int use_msvcrt = 0; struct strarray value; struct incl_file *file; @@ -2300,6 +2314,7 @@ static void update_makefile( const char *path ) dllflags = get_expanded_make_var_array( "DLLFLAGS" ); imports = get_expanded_make_var_array( "IMPORTS" ); + use_msvcrt = 0; for (i = 0; i < appmode.count && !use_msvcrt; i++) use_msvcrt = !strcmp( appmode.str[i], "-mno-cygwin" ); for (i = 0; i < imports.count && !use_msvcrt; i++) @@ -2308,7 +2323,6 @@ static void update_makefile( const char *path ) include_args = empty_strarray; define_args = empty_strarray; strarray_add( &define_args, "-D__WINESRC__" ); - strarray_add( &include_args, strmake( "-I%s", top_dir_path( "include" ))); if (!tools_ext) tools_ext = ""; @@ -2320,11 +2334,7 @@ static void update_makefile( const char *path ) strarray_add_uniq( &define_args, value.str[i] ); strarray_addall( &define_args, get_expanded_make_var_array( "EXTRADEFS" )); - if (use_msvcrt) - { - strarray_add( &dllflags, get_expanded_make_variable( "MSVCRTFLAGS" )); - strarray_add( &include_args, strmake( "-I%s", top_dir_path( "include/msvcrt" ))); - } + if (use_msvcrt) strarray_add( &dllflags, get_expanded_make_variable( "MSVCRTFLAGS" )); list_init( &sources ); list_init( &includes );

1 0

Alexandre Julliard : makedep: Look for source files only in the source directory.
by Alexandre Julliard 18 Feb '14

18 Feb '14

Module: wine Branch: master Commit: c195e1355a60db099d5fe32be59a77f1320071c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c195e1355a60db099d5fe32be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 15 10:53:00 2014 +0100 makedep: Look for source files only in the source directory. --- tools/makedep.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 6ad2ade..345dd37 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -673,18 +673,10 @@ static FILE *open_src_file( struct incl_file *pFile ) { FILE *file; - /* first try name as is */ - if ((file = open_file( pFile->name ))) - { - pFile->filename = xstrdup( pFile->name ); - return file; - } - /* now try in source dir */ - if (src_dir) - { - pFile->filename = src_dir_path( pFile->name ); - file = open_file( pFile->filename ); - } + /* try in source dir */ + pFile->filename = src_dir_path( pFile->name ); + file = open_file( pFile->filename ); + /* now try parent dir */ if (!file && parent_dir) {

1 0

Alexandre Julliard : makedep: Generate .fon rules directly into the output instead of adding generated files.
by Alexandre Julliard 18 Feb '14

18 Feb '14

Module: wine Branch: master Commit: 8c0a717a5c71e14839d99fee4f77ed5ed8502a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0a717a5c71e14839d99fee4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 15:53:14 2014 +0100 makedep: Generate .fon rules directly into the output instead of adding generated files. --- tools/makedep.c | 59 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 345dd37..fe8a614 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -41,7 +41,7 @@ struct incl_file char *name; char *filename; char *sourcename; /* source file name for generated headers */ - char *args; /* custom arguments for makefile rule */ + void *args; /* custom arguments for makefile rule */ struct incl_file *included_by; /* file that included this one */ int included_line; /* line where this file was included */ unsigned int flags; /* flags (see below) */ @@ -64,6 +64,7 @@ struct incl_file #define FLAG_IDL_HEADER 0x008000 /* generates a header (.h) file */ #define FLAG_RC_PO 0x010000 /* rc file contains translations */ #define FLAG_C_IMPLIB 0x020000 /* file is part of an import library */ +#define FLAG_SFD_FONTS 0x040000 /* sfd file generated bitmap fonts */ static const struct { @@ -903,12 +904,15 @@ static void parse_pragma_directive( struct incl_file *source, char *str ) { if (!strcmp( flag, "font" )) { - struct incl_file *file; - char *obj = strtok( NULL, " \t" ); - if (!strendswith( obj, ".fon" )) return; - file = add_generated_source( obj, NULL ); - file->sourcename = replace_extension( source->name, ".sfd", ".ttf" ); - file->args = xstrdup( strtok( NULL, "" )); + struct strarray *array = source->args; + + if (!array) + { + source->args = array = xmalloc( sizeof(*array) ); + *array = empty_strarray; + source->flags |= FLAG_SFD_FONTS; + } + strarray_add( array, xstrdup( strtok( NULL, "" ))); return; } } @@ -1450,7 +1454,8 @@ static void output_include( struct incl_file *pFile, struct incl_file *owner ) static struct strarray output_sources(void) { struct incl_file *source; - int i, is_win16 = 0; + unsigned int i; + int is_win16 = 0; const char *dllext = ".so"; struct strarray object_files = empty_strarray; struct strarray crossobj_files = empty_strarray; @@ -1587,7 +1592,6 @@ static struct strarray output_sources(void) else if (!strcmp( ext, "idl" )) /* IDL file */ { struct strarray targets = empty_strarray; - unsigned int i; char *dest; if (!source->flags || find_include_file( strmake( "%s.h", obj ))) @@ -1658,22 +1662,27 @@ static struct strarray output_sources(void) output( "uninstall::\n" ); output( "\t$(RM) $(DESTDIR)$(fontdir)/%s.ttf\n", obj ); } - continue; /* no dependencies */ - } - else if (!strcmp( ext, "fon" )) /* bitmap font file */ - { - strarray_add( &all_targets, source->name ); - output( "%s.fon: %s %s\n", obj, tools_path( "sfnt2fon" ), - src_dir_path( source->sourcename )); - output( "\t%s -o $@ %s %s\n", tools_path( "sfnt2fon" ), - src_dir_path( source->sourcename ), source->args ); - output( "install install-lib:: %s\n", source->name ); - output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s\n", source->name, source->name ); - output( "uninstall::\n" ); - output( "\t$(RM) $(DESTDIR)$(fontdir)/%s\n", source->name ); - strarray_add_uniq( &phony_targets, "install" ); - strarray_add_uniq( &phony_targets, "install-lib" ); - strarray_add_uniq( &phony_targets, "uninstall" ); + if (source->flags & FLAG_SFD_FONTS) + { + struct strarray *array = source->args; + + for (i = 0; i < array->count; i++) + { + char *font = strtok( xstrdup(array->str[i]), " \t" ); + char *args = strtok( NULL, "" ); + + strarray_add( &all_targets, font ); + output( "%s: %s %s\n", font, tools_path( "sfnt2fon" ), ttf_file ); + output( "\t%s -o $@ %s %s\n", tools_path( "sfnt2fon" ), ttf_file, args ); + output( "install install-lib:: %s\n", font ); + output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s\n", font, font ); + output( "uninstall::\n" ); + output( "\t$(RM) $(DESTDIR)$(fontdir)/%s\n", font ); + strarray_add_uniq( &phony_targets, "install" ); + strarray_add_uniq( &phony_targets, "install-lib" ); + strarray_add_uniq( &phony_targets, "uninstall" ); + } + } continue; /* no dependencies */ } else if (!strcmp( ext, "svg" )) /* svg file */

1 0

Francois Gouget : faultrep/tests: AddERExcludedApplication() fails if we have insufficient privileges.
by Alexandre Julliard 18 Feb '14

18 Feb '14

Module: wine Branch: master Commit: a7897d3d3ed9f4e1087a999f296513daccb00b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7897d3d3ed9f4e1087a999f2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 17 18:25:02 2014 +0100 faultrep/tests: AddERExcludedApplication() fails if we have insufficient privileges. --- dlls/faultrep/tests/faultrep.c | 46 +++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index 934eee7..e6961f9 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -33,6 +33,34 @@ static const char regpath_root[] = "Software\\Microsoft\\PCHealth\\ErrorReporting"; static const char regpath_exclude[] = "ExclusionList"; + +static BOOL is_process_limited(void) +{ + static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; + HANDLE token; + + if (!pOpenProcessToken) + { + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); + if (!pOpenProcessToken) + return FALSE; + } + + if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + { + BOOL ret; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; + + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); + return (ret && type == TokenElevationTypeLimited); + } + return FALSE; +} + + /* ###### */ static void test_AddERExcludedApplicationA(void) @@ -68,12 +96,20 @@ static void test_AddERExcludedApplicationA(void) SetLastError(0xdeadbeef); /* existence of the path doesn't matter this function succeeded */ res = AddERExcludedApplicationA("winetest_faultrep.exe"); - ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError()); + if (is_process_limited()) + { + /* LastError is not set! */ + ok(!res, "AddERExcludedApplicationA should have failed got %d\n", res); + } + else + { + ok(res, "AddERExcludedApplicationA failed (le=0x%x)\n", GetLastError()); - /* add, when already present */ - SetLastError(0xdeadbeef); - res = AddERExcludedApplicationA("winetest_faultrep.exe"); - ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError()); + /* add, when already present */ + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA("winetest_faultrep.exe"); + ok(res, "AddERExcludedApplicationA failed (le=0x%x)\n", GetLastError()); + } /* cleanup */ RegDeleteValueA(hexclude, "winetest_faultrep.exe");

1 0