November 2013 - Wine-commits

Qian Hong : server: Fixed winstation object leak in open_input_desktop.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: ca4b3f0f73605082a77a427b2d94a1e23bc47ca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4b3f0f73605082a77a427b2… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Nov 9 17:17:11 2013 +0800 server: Fixed winstation object leak in open_input_desktop. --- server/winstation.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index 2eaffb0..08389bb 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -563,6 +563,7 @@ DECL_HANDLER(open_input_desktop) if (!(winstation->flags & WSF_VISIBLE)) { set_error( STATUS_ILLEGAL_FUNCTION ); + release_object( winstation ); return; }

1 0

Frédéric Delanoy : comctl32: Use BOOL type where appropriate.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 5dfe1b0cfea7a85b3b059a49253dfec02db657e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dfe1b0cfea7a85b3b059a492… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 9 11:03:39 2013 +0100 comctl32: Use BOOL type where appropriate. --- dlls/comctl32/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index f6ddb42..0c9714d 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -94,8 +94,8 @@ typedef struct INT idCommand; BYTE fsState; BYTE fsStyle; - BYTE bHot; - BYTE bDropDownPressed; + BOOL bHot; + BOOL bDropDownPressed; DWORD_PTR dwData; INT_PTR iString; INT nRow;

1 0

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

11 Nov '13

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

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

11 Nov '13

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

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

11 Nov '13

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

Rico Schüller : d3dx9/tests: Fix variable names.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: c1a0fbd146d868bcd3286b3cdd29f514b6e239e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a0fbd146d868bcd3286b3cd… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 10 20:08:24 2013 +0100 d3dx9/tests: Fix variable names. --- dlls/d3dx9_36/tests/shader.c | 54 +++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a0fbd146d868bcd3286…

1 0

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

11 Nov '13

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

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

11 Nov '13

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

André Hentschel : wineboot: Add hardware registry keys on ARM.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: cc2866d52159759d9f29157877d00686eafa5393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2866d52159759d9f2915787… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 10 22:44:52 2013 +0100 wineboot: Add hardware registry keys on ARM. --- programs/wineboot/wineboot.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 21a84ff..f5d751d 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -177,6 +177,7 @@ static void create_hardware_registry_keys(void) static const WCHAR IdentifierW[] = {'I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR ProcessorNameStringW[] = {'P','r','o','c','e','s','s','o','r','N','a','m','e','S','t','r','i','n','g',0}; static const WCHAR SysidW[] = {'A','T',' ','c','o','m','p','a','t','i','b','l','e',0}; + static const WCHAR ARMSysidW[] = {'A','R','M',' ','p','r','o','c','e','s','s','o','r',' ','f','a','m','i','l','y',0}; static const WCHAR mhzKeyW[] = {'~','M','H','z',0}; static const WCHAR VendorIdentifierW[] = {'V','e','n','d','o','r','I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR VenidIntelW[] = {'G','e','n','u','i','n','e','I','n','t','e','l',0}; @@ -184,6 +185,8 @@ static void create_hardware_registry_keys(void) static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',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}; static const WCHAR IntelCpuStringW[] = {'I','n','t','e','l','(','R',')',' ','P','e','n','t','i','u','m','(','R',')',' ','4',' ', 'C','P','U',' ','2','.','4','0','G','H','z',0}; unsigned int i; @@ -202,7 +205,16 @@ static void create_hardware_registry_keys(void) memset( power_info, 0, sizeof_power_info ); /*TODO: report 64bit processors properly*/ - sprintfW( idW, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + switch(sci.Architecture) + { + case PROCESSOR_ARCHITECTURE_ARM: + sprintfW( idW, ARMCpuDescrW, sci.Level, sci.Revision ); + break; + default: + case PROCESSOR_ARCHITECTURE_INTEL: + sprintfW( idW, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + } if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, SystemW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &system_key, NULL )) @@ -211,9 +223,19 @@ static void create_hardware_registry_keys(void) return; } - set_reg_value( system_key, IdentifierW, SysidW ); + switch(sci.Architecture) + { + case PROCESSOR_ARCHITECTURE_ARM: + set_reg_value( system_key, IdentifierW, ARMSysidW ); + break; + default: + case PROCESSOR_ARCHITECTURE_INTEL: + set_reg_value( system_key, IdentifierW, SysidW ); + break; + } - if (RegCreateKeyExW( system_key, fpuW, 0, NULL, REG_OPTION_VOLATILE, + if (sci.Architecture == PROCESSOR_ARCHITECTURE_ARM || + RegCreateKeyExW( system_key, fpuW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &fpu_key, NULL )) fpu_key = 0; if (RegCreateKeyExW( system_key, cpuW, 0, NULL, REG_OPTION_VOLATILE, @@ -230,13 +252,14 @@ static void create_hardware_registry_keys(void) { RegSetValueExW( hkey, FeatureSetW, 0, REG_DWORD, (BYTE *)&sci.FeatureSet, sizeof(DWORD) ); set_reg_value( hkey, IdentifierW, idW ); - /*TODO; report amd's properly*/ + /*TODO; report ARM and AMD properly*/ set_reg_value( hkey, ProcessorNameStringW, IntelCpuStringW ); set_reg_value( hkey, VendorIdentifierW, VenidIntelW ); RegSetValueExW( hkey, mhzKeyW, 0, REG_DWORD, (BYTE *)&power_info[i].MaxMhz, sizeof(DWORD) ); RegCloseKey( hkey ); } - if (!RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, + if (sci.Architecture != PROCESSOR_ARCHITECTURE_ARM && + !RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { set_reg_value( hkey, IdentifierW, idW );

1 0

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

11 Nov '13

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