November 2013 - Wine-Commits

Zhenbo Li : shell32/tests: Add tests for SHFileOperationA.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: 7c1602464a9d8fb65663ff92de84b4888a1ac479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1602464a9d8fb65663ff92d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Nov 11 23:52:31 2013 +0800 shell32/tests: Add tests for SHFileOperationA. --- dlls/shell32/tests/shlfileop.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a62292b..bb15054 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -646,6 +646,19 @@ static void test_delete(void) else skip("Test would show a dialog box\n"); + /* delete an existent file and a nonexistent file */ + shfo.pFrom = "test1.txt\0nonexistent.txt\0test2.txt\0"; + shfo.wFunc = FO_DELETE; + ret = SHFileOperationA(&shfo); + todo_wine + ok(ret == 1026 || + ret == ERROR_FILE_NOT_FOUND || /* Vista */ + broken(ret == ERROR_SUCCESS), /* NT4 */ + "Expected 1026 or ERROR_FILE_NOT_FOUND, got %d\n", ret); + todo_wine + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + /* try the FOF_NORECURSION flag, continues deleting subdirs */ init_shfo_tests(); shfo.pFrom = "testdir2\0";

1 0

André Hentschel : include: Add more ARM processor feature flags.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: fd018289035554a8a87f5335a6c571c2706b24fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd018289035554a8a87f5335a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 10 22:46:17 2013 +0100 include: Add more ARM processor feature flags. --- include/winnt.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 13b35bd..f1751a5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -649,6 +649,7 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_MSIL 8 #define PROCESSOR_ARCHITECTURE_AMD64 9 #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 +#define PROCESSOR_ARCHITECTURE_NEUTRAL 11 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF /* dwProcessorType */ @@ -865,6 +866,11 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20 #define PF_VIRT_FIRMWARE_ENABLED 21 #define PF_RDWRFSGSBASE_AVAILABLE 22 +#define PF_FASTFAIL_AVAILABLE 23 +#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24 +#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25 +#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26 +#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27 /* Execution state flags */

1 0

Alexandre Julliard : makefiles: Generate explicit rules for building mo files.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: 7f8412f253866c1910566c4fe130f76f20fc0d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8412f253866c1910566c4fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 11 11:46:04 2013 +0100 makefiles: Generate explicit rules for building mo files. --- Make.rules.in | 7 ++----- configure | 8 ++++++++ configure.ac | 9 +++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index d9c9827..a853afe 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -20,7 +20,7 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTR IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c +CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) $(XTEMPLATE_SRCS:.x=.h) \ $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) @@ -32,7 +32,7 @@ ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Implicit rules -.SUFFIXES: .ok .man.in .man .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .ok .man.in .man @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.ok: $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ @@ -49,9 +49,6 @@ ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) .svg.bmp: CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDIMAGE) $< $@ -.po.mo: - $(MSGFMT) -o $@ $< - # Rules for main module $(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) Makefile.in diff --git a/configure b/configure index 5dd4a59..663de64 100755 --- a/configure +++ b/configure @@ -17428,6 +17428,14 @@ then wine_fn_append_rule "__builddeps__: \$(ALL_MO_FILES) clean:: \$(RM) \$(ALL_MO_FILES)" + + posrc="po" + test "$srcdir" = . || posrc="$srcdir/po" + for i in $LINGUAS + do + wine_fn_append_rule "po/$i.mo: $posrc/$i.po + \$(MSGFMT) -o \$@ $posrc/$i.po" + done else LINGUAS= fi diff --git a/configure.ac b/configure.ac index 8bbbac5..98220b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3489,6 +3489,15 @@ then [__builddeps__: \$(ALL_MO_FILES) clean:: \$(RM) \$(ALL_MO_FILES)]) + + posrc="po" + test "$srcdir" = . || posrc="$srcdir/po" + for i in $LINGUAS + do + WINE_APPEND_RULE( +[po/$i.mo: $posrc/$i.po + \$(MSGFMT) -o \$@ $posrc/$i.po]) + done else LINGUAS= fi

1 0

André Hentschel : wineboot: Don' t add registry keys for unsupported IA64 architecture.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: 57c54bc9ad1e13ee7cd730b2ffb4df834bf02a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c54bc9ad1e13ee7cd730b2f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 10 22:46:11 2013 +0100 wineboot: Don't add registry keys for unsupported IA64 architecture. --- programs/wineboot/wineboot.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index f5d751d..a20b4e1 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -300,7 +300,6 @@ static void create_environment_registry_keys( void ) static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR armW[] = {'A','R','M',0}; - static const WCHAR IA64W[] = {'I','A','6','4',0}; static const WCHAR AMD64W[] = {'A','M','D','6','4',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; @@ -328,7 +327,6 @@ static void create_environment_registry_keys( void ) { case PROCESSOR_ARCHITECTURE_AMD64: arch = AMD64W; break; case PROCESSOR_ARCHITECTURE_ARM: arch = armW; break; - case PROCESSOR_ARCHITECTURE_IA64: arch = IA64W; break; default: case PROCESSOR_ARCHITECTURE_INTEL: arch = x86W; break; }

1 0

André Hentschel : ntdll: Improved reporting of CPU Level and Revision on ARM.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: eef5e45ee6aae7029ec3ec0565fbbdc2ee29b59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef5e45ee6aae7029ec3ec056… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 10 22:40:23 2013 +0100 ntdll: Improved reporting of CPU Level and Revision on ARM. --- dlls/ntdll/nt.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c9499d6..db8272f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1080,10 +1080,16 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) while (isspace(*value)) value++; if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "CPU architecture")) + if (!strcasecmp(line, "CPU part")) { if (isdigit(value[0])) - info->Level = atoi(value); + info->Level = strtol(value, NULL, 16); + continue; + } + if (!strcasecmp(line, "CPU revision")) + { + if (isdigit(value[0])) + info->Revision = atoi(value); continue; } if (!strcasecmp(line, "features"))

1 0

Nikolay Sivov : atl80/tests: Add SxS manifest to make it run on windows.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: 7c066957278b7f796e10039d4cefee88ff5602d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c066957278b7f796e10039d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 10 12:55:09 2013 +0400 atl80/tests: Add SxS manifest to make it run on windows. --- dlls/atl80/tests/Makefile.in | 3 +++ dlls/atl80/tests/atl80.manifest | 22 ++++++++++++++++++++++ dlls/atl80/tests/atl80.rc | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/atl80/tests/Makefile.in b/dlls/atl80/tests/Makefile.in index c4d9222..bf59c3f 100644 --- a/dlls/atl80/tests/Makefile.in +++ b/dlls/atl80/tests/Makefile.in @@ -5,4 +5,7 @@ EXTRADEFS = -D_ATL_VER=_ATL_VER_80 C_SRCS = \ atl.c +RC_SRCS = \ + atl80.rc + @MAKE_TEST_RULES@ diff --git a/dlls/atl80/tests/atl80.manifest b/dlls/atl80/tests/atl80.manifest new file mode 100644 index 0000000..712793f --- /dev/null +++ b/dlls/atl80/tests/atl80.manifest @@ -0,0 +1,22 @@ +<?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.atl80.Test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine atl80 test suite</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="microsoft.vc80.atl" + version="8.0.50727.4053" + processorArchitecture="*" + publicKeyToken="1fc8b3b9a1e18e3b" + language="*" + /> +</dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/atl80/tests/atl80.rc b/dlls/atl80/tests/atl80.rc new file mode 100644 index 0000000..2229b43 --- /dev/null +++ b/dlls/atl80/tests/atl80.rc @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2013 Nikolay Sivov + * + * 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.h" + +/* @makedep: atl80.manifest */ +1 RT_MANIFEST atl80.manifest

1 0

Frédéric Delanoy : winegstreamer: Use boolean type where appropriate.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: 50435f6623e8cb79e4996e271d515efe813223a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50435f6623e8cb79e4996e271… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 9 11:03:41 2013 +0100 winegstreamer: Use boolean type where appropriate. --- dlls/winegstreamer/gstdemux.c | 74 ++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50435f6623e8cb79e4996…

1 0

Frédéric Delanoy : winedbg: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: fe580c083de67703df33729ec2c70938b64ff9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe580c083de67703df33729ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 9 11:03:40 2013 +0100 winedbg: Use BOOL type where appropriate. --- programs/winedbg/be_arm.c | 2 +- programs/winedbg/be_arm64.c | 2 +- programs/winedbg/be_cpu.h | 2 +- programs/winedbg/be_i386.c | 2 +- programs/winedbg/be_ppc.c | 2 +- programs/winedbg/be_x86_64.c | 2 +- programs/winedbg/break.c | 6 +++--- programs/winedbg/debugger.h | 22 +++++++++++----------- programs/winedbg/display.c | 10 +++++----- programs/winedbg/expr.c | 4 ++-- programs/winedbg/symbol.c | 2 +- programs/winedbg/tgt_active.c | 4 ++-- programs/winedbg/types.c | 8 ++++---- 13 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe580c083de67703df337…

1 0

Alexandre Julliard : dbghelp: Remove a useless DllMain, msvcrt can' t be unloaded.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: 836b682ed3bff439f1264bc9cee4ecce6ca88bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836b682ed3bff439f1264bc9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 9 11:22:56 2013 +0100 dbghelp: Remove a useless DllMain, msvcrt can't be unloaded. --- dlls/dbghelp/dbghelp.c | 19 ------------------- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/symbol.c | 1 + 3 files changed, 1 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index b61676d..f5d0b67 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -65,25 +65,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); */ unsigned dbghelp_options = SYMOPT_UNDNAME; -HANDLE hMsvcrt = NULL; - -/*********************************************************************** - * DllMain (DEBUGHLP.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: break; - case DLL_PROCESS_DETACH: - if (hMsvcrt) FreeLibrary(hMsvcrt); - break; - case DLL_THREAD_ATTACH: break; - case DLL_THREAD_DETACH: break; - default: break; - } - return TRUE; -} static struct process* process_first /* = NULL */; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f18a0fe..9390fab 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -545,7 +545,6 @@ extern struct cpu* dbghelp_current_cpu DECLSPEC_HIDDEN; /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess) DECLSPEC_HIDDEN; -extern HANDLE hMsvcrt DECLSPEC_HIDDEN; extern BOOL validate_addr64(DWORD64 addr) DECLSPEC_HIDDEN; extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) DECLSPEC_HIDDEN; extern void* fetch_buffer(struct process* pcs, unsigned size) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ebc4644..e6401a9 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1759,6 +1759,7 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, DWORD UndecoratedLength, DWORD Flags) { /* undocumented from msvcrt */ + static HANDLE hMsvcrt; static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short); static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0};

1 0

André Hentschel : wineboot: Add environment registry keys on ARM.
by Alexandre Julliard Nov. 11, 2013

Nov. 11, 2013

Module: wine Branch: master Commit: 6e0b88006fd04fb9ef0f3303b27271a0d36f060e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0b88006fd04fb9ef0f3303b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 10 22:40:36 2013 +0100 wineboot: Add environment registry keys on ARM. --- programs/wineboot/wineboot.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index a062d81..21a84ff 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -276,6 +276,7 @@ static void create_environment_registry_keys( void ) static const WCHAR NumProcW[] = {'N','U','M','B','E','R','_','O','F','_','P','R','O','C','E','S','S','O','R','S',0}; static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR armW[] = {'A','R','M',0}; static const WCHAR IA64W[] = {'I','A','6','4',0}; static const WCHAR AMD64W[] = {'A','M','D','6','4',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; @@ -285,6 +286,8 @@ static void create_environment_registry_keys( void ) static const WCHAR Percent04XW[] = {'%','0','4','x',0}; static const WCHAR IntelCpuDescrW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',',',' ','G','e','n','u','i','n','e','I','n','t','e','l',0}; + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; HKEY env_key; SYSTEM_CPU_INFORMATION sci; @@ -301,14 +304,23 @@ static void create_environment_registry_keys( void ) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_AMD64: arch = AMD64W; break; + case PROCESSOR_ARCHITECTURE_ARM: arch = armW; break; case PROCESSOR_ARCHITECTURE_IA64: arch = IA64W; break; default: case PROCESSOR_ARCHITECTURE_INTEL: arch = x86W; break; } set_reg_value( env_key, ProcArchW, arch ); - /* TODO: currently hardcoded Intel, add different processors */ - sprintfW( buffer, IntelCpuDescrW, arch, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + switch(sci.Architecture) + { + case PROCESSOR_ARCHITECTURE_ARM: + sprintfW( buffer, ARMCpuDescrW, sci.Level, sci.Revision ); + break; + default: + case PROCESSOR_ARCHITECTURE_INTEL: + sprintfW( buffer, IntelCpuDescrW, arch, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + } set_reg_value( env_key, ProcIdW, buffer ); sprintfW( buffer, PercentDW, sci.Level );

1 0