wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Zebediah Figura : ntoskrnl.exe: Implement PsTerminateSystemThread().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 08ba44618d0f57b21c9b20d90464e9dfbb1dc579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08ba44618d0f57b21c9b20d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 22:56:24 2019 -0600 ntoskrnl.exe: Implement PsTerminateSystemThread(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4986ca1..ec78f4b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2803,10 +2803,10 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** * PsTerminateSystemThread (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS ExitStatus) +NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS status) { - FIXME( "stub: %u\n", ExitStatus ); - return STATUS_NOT_IMPLEMENTED; + TRACE("status %#x.\n", status); + ExitThread( status ); }

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExInterlockedRemoveHeadList().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 171bf1e2a04d8b60a1069b9aa0146c2fc5d40092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=171bf1e2a04d8b60a1069b9a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 22:56:23 2019 -0600 ntoskrnl.exe: Implement ExInterlockedRemoveHeadList(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 48 ++---------------------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 47 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/sync.c | 28 +++++++++++++++++++++ include/ddk/wdm.h | 1 + 5 files changed, 79 insertions(+), 47 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 994cd90..4986ca1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -52,6 +52,8 @@ #include "wine/rbtree.h" #include "wine/svcctl.h" +#include "ntoskrnl_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(plugplay); @@ -143,29 +145,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -#ifdef __i386__ -#define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ - __ASM_STDCALL_FUNC( name, 4, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(4)) -#define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ - __ASM_STDCALL_FUNC( name, 8, \ - "popl %eax\n\t" \ - "pushl %edx\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) -#define DEFINE_FASTCALL3_ENTRYPOINT( name ) \ - __ASM_STDCALL_FUNC( name, 12, \ - "popl %eax\n\t" \ - "pushl %edx\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(12)) -#endif - static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -3089,29 +3068,6 @@ NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) return STATUS_NOT_IMPLEMENTED; } -/***************************************************** - * ExInterlockedRemoveHeadList (NTOSKRNL.EXE.@) - */ -PLIST_ENTRY WINAPI ExInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) -{ - FIXME("(%p %p) stub\n", head, lock); - return NULL; -} - -/*********************************************************************** - * ExfInterlockedRemoveHeadList (NTOSKRNL.EXE.@) - */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( ExfInterlockedRemoveHeadList ) -PLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) -#else -PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) -#endif -{ - FIXME("(%p %p) stub\n", head, lock); - return ExInterlockedRemoveHeadList( head, lock ); -} - /*********************************************************************** * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8483b36..bf87504 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -22,7 +22,7 @@ @ stub ExfInterlockedInsertTailList @ stub ExfInterlockedPopEntryList @ stub ExfInterlockedPushEntryList -@ stdcall -norelay ExfInterlockedRemoveHeadList(ptr ptr) +@ stdcall -norelay -arch=i386 ExfInterlockedRemoveHeadList(ptr ptr) @ stub ExfReleasePushLock @ stub Exfi386InterlockedDecrementLong @ stub Exfi386InterlockedExchangeUlong diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h new file mode 100644 index 0000000..241e15f --- /dev/null +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -0,0 +1,47 @@ +/* + * ntoskrnl.exe implementation + * + * Copyright (C) 2007 Alexandre Julliard + * + * 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 + */ + +#ifndef __WINE_NTOSKRNL_PRIVATE_H +#define __WINE_NTOSKRNL_PRIVATE_H + +#ifdef __i386__ +#define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ + __ASM_STDCALL_FUNC( name, 4, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(4)) +#define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ + __ASM_STDCALL_FUNC( name, 8, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) +#define DEFINE_FASTCALL3_ENTRYPOINT( name ) \ + __ASM_STDCALL_FUNC( name, 12, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(12)) +#endif + +#endif diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index c46d7f5..475fcf1 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdarg.h> #include "ntstatus.h" @@ -30,6 +31,8 @@ #include "wine/debug.h" +#include "ntoskrnl_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); enum object_type @@ -433,3 +436,28 @@ void WINAPI IoReleaseCancelSpinLock( KIRQL irql ) TRACE("irql %u.\n", irql); KeReleaseSpinLock( &cancel_lock, irql ); } + +#ifdef __i386__ +DEFINE_FASTCALL2_ENTRYPOINT( ExfInterlockedRemoveHeadList ) +PLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_ExfInterlockedRemoveHeadList( LIST_ENTRY *list, KSPIN_LOCK *lock ) +{ + return ExInterlockedRemoveHeadList( list, lock ); +} +#endif + +/*********************************************************************** + * ExInterlockedRemoveHeadList (NTOSKRNL.EXE.@) + */ +LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList( LIST_ENTRY *list, KSPIN_LOCK *lock ) +{ + LIST_ENTRY *ret; + KIRQL irql; + + TRACE("list %p, lock %p.\n", list, lock); + + KeAcquireSpinLock( lock, &irql ); + ret = RemoveHeadList( list ); + KeReleaseSpinLock( lock, irql ); + + return ret; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a9bdd3d..a53c7a2 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1386,6 +1386,7 @@ void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); +LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI IoAcquireCancelSpinLock(KIRQL*);

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoAcquireCancelSpinLock().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 834db731213f669416191cead9632f958275c2ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=834db731213f669416191cea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 22:56:22 2019 -0600 ntoskrnl.exe: Implement IoAcquireCancelSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2a061f3..994cd90 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -776,15 +776,6 @@ void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) FIXME("(%p): stub\n", FastMutex); } - -/*********************************************************************** - * IoAcquireCancelSpinLock (NTOSKRNL.EXE.@) - */ -void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) -{ - FIXME("(%p): stub\n", irql); -} - /*********************************************************************** * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 36282fe..c46d7f5 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -417,6 +417,15 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) static KSPIN_LOCK cancel_lock; /*********************************************************************** + * IoAcquireCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoAcquireCancelSpinLock( KIRQL *irql ) +{ + TRACE("irql %p.\n", irql); + KeAcquireSpinLock( &cancel_lock, irql ); +} + +/*********************************************************************** * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) */ void WINAPI IoReleaseCancelSpinLock( KIRQL irql ) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1c12c1e..a9bdd3d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1388,6 +1388,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); +void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN);

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoReleaseCancelSpinLock().
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: e834d38c77d0c62ac882eadb83b6761f62a205d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e834d38c77d0c62ac882eadb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 22:56:21 2019 -0600 ntoskrnl.exe: Implement IoReleaseCancelSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/Makefile.in | 1 + dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ---------- dlls/ntoskrnl.exe/sync.c | 11 +++++++++++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index 8efaf55..cc2620e 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -1,4 +1,5 @@ MODULE = hal.dll +IMPORTLIB = hal C_SRCS = \ hal.c diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 8cafaad..3861d26 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,6 +1,6 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl -IMPORTS = advapi32 +IMPORTS = advapi32 hal DELAYIMPORTS = setupapi user32 C_SRCS = \ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a48b9e3..2a061f3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -785,16 +785,6 @@ void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) FIXME("(%p): stub\n", irql); } - -/*********************************************************************** - * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) - */ -void WINAPI IoReleaseCancelSpinLock(KIRQL irql) -{ - FIXME("(%u): stub\n", irql); -} - - /*********************************************************************** * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 74e84a6..36282fe 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -413,3 +413,14 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) return 0; } #endif + +static KSPIN_LOCK cancel_lock; + +/*********************************************************************** + * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseCancelSpinLock( KIRQL irql ) +{ + TRACE("irql %u.\n", irql); + KeReleaseSpinLock( &cancel_lock, irql ); +}

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: b37c1d83e497b71f676b9c481dc374f8c4d6ab5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37c1d83e497b71f676b9c48… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Jan 23 05:47:40 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 156 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 75 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b37c1d83e497b71f676b…

1 0

Hans Leidekker : wbemprox: Create one processor object per package.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: cee89865294fc1d419d67cac4052ce0815731ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee89865294fc1d419d67cac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:14 2019 +0100 wbemprox: Create one processor object per package. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 61 ++++++++++++++++++++++++------------------- dlls/wbemprox/tests/query.c | 63 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cee89865294fc1d419d6…

1 0

Hans Leidekker : wbemprox: Fix processor caption on AMD 64-bit.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: f2e1c51422084066ae0b72a8e5f0043101e1344f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e1c51422084066ae0b72a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:13 2019 +0100 wbemprox: Fix processor caption on AMD 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 62 +++++++++++++++++++++++++-------------------- dlls/wbemprox/tests/query.c | 11 ++++++++ 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 620d64e..03f6e62 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2842,13 +2842,6 @@ void do_cpuid( unsigned int ax, unsigned int *p ) } #endif -static const WCHAR *get_osarchitecture(void) -{ - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; - return os_32bitW; -} static unsigned int get_processor_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) { unsigned int model, family_id = (reg0 & (0x0f << 8)) >> 8; @@ -2863,6 +2856,32 @@ static unsigned int get_processor_model( unsigned int reg0, unsigned int *steppi *stepping = reg0 & 0x0f; return model; } +static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +{ + unsigned int i; + unsigned char *p = (unsigned char *)regs; + + for (i = 0; i < len; i++) { buffer[i] = *p++; } + buffer[i] = 0; +} +static void get_processor_manufacturer( WCHAR *manufacturer ) +{ + unsigned int tmp, regs[4] = {0, 0, 0, 0}; + + do_cpuid( 0, regs ); + tmp = regs[2]; /* swap edx and ecx */ + regs[2] = regs[3]; + regs[3] = tmp; + + regs_to_str( regs + 1, 12, manufacturer ); +} +static const WCHAR *get_osarchitecture(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; + return os_32bitW; +} static void get_processor_caption( WCHAR *caption ) { static const WCHAR fmtW[] = @@ -2870,9 +2889,17 @@ static void get_processor_caption( WCHAR *caption ) 'M','o','d','e','l',' ','%','u',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; - const WCHAR *arch = (get_osarchitecture() == os_32bitW) ? x86W : intel64W; + static const WCHAR amd64W[] = {'A','M','D','6','4',0}; + static const WCHAR authenticamdW[] = {'A','u','t','h','e','n','t','i','c','A','M','D',0}; + const WCHAR *arch; + WCHAR manufacturer[13]; unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; + get_processor_manufacturer( manufacturer ); + if (get_osarchitecture() == os_32bitW) arch = x86W; + else if (!strcmpW( manufacturer, authenticamdW )) arch = amd64W; + else arch = intel64W; + do_cpuid( 1, regs ); model = get_processor_model( regs[0], &stepping, &family ); @@ -2903,25 +2930,6 @@ static void get_processor_id( WCHAR *processor_id ) do_cpuid( 1, regs ); sprintfW( processor_id, fmtW, regs[3], regs[0] ); } -static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) -{ - unsigned int i; - unsigned char *p = (unsigned char *)regs; - - for (i = 0; i < len; i++) { buffer[i] = *p++; } - buffer[i] = 0; -} -static void get_processor_manufacturer( WCHAR *manufacturer ) -{ - unsigned int tmp, regs[4] = {0, 0, 0, 0}; - - do_cpuid( 0, regs ); - tmp = regs[2]; /* swap edx and ecx */ - regs[2] = regs[3]; - regs[3] = tmp; - - regs_to_str( regs + 1, 12, manufacturer ); -} static void get_processor_name( WCHAR *name ) { unsigned int regs[4] = {0, 0, 0, 0}; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0fa6b5e..82195eb 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1553,6 +1553,8 @@ static void test_Win32_Processor( IWbemServices *services ) { static const WCHAR architectureW[] = {'A','r','c','h','i','t','e','c','t','u','r','e',0}; + static const WCHAR captionW[] = + {'C','a','p','t','i','o','n',0}; static const WCHAR familyW[] = {'F','a','m','i','l','y',0}; static const WCHAR levelW[] = @@ -1588,6 +1590,15 @@ static void test_Win32_Processor( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "caption %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, architectureW, 0, &val, &type, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) );

1 0

Hans Leidekker : wbemprox: Include extended model and family fields in processor properties.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: dfb0c8c951ec2349a17ef228c39862ced8148f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb0c8c951ec2349a17ef228… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:12 2019 +0100 wbemprox: Include extended model and family fields in processor properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 87cdc0a..620d64e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2849,6 +2849,20 @@ static const WCHAR *get_osarchitecture(void) if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; return os_32bitW; } +static unsigned int get_processor_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) +{ + unsigned int model, family_id = (reg0 & (0x0f << 8)) >> 8; + + model = (reg0 & (0x0f << 4)) >> 4; + if (family_id == 6 || family_id == 15) model |= (reg0 & (0x0f << 16)) >> 12; + if (family) + { + *family = family_id; + if (family_id == 15) *family += (reg0 & (0xff << 20)) >> 20; + } + *stepping = reg0 & 0x0f; + return model; +} static void get_processor_caption( WCHAR *caption ) { static const WCHAR fmtW[] = @@ -2857,19 +2871,23 @@ static void get_processor_caption( WCHAR *caption ) static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; const WCHAR *arch = (get_osarchitecture() == os_32bitW) ? x86W : intel64W; - unsigned int regs[4] = {0, 0, 0, 0}; + unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; do_cpuid( 1, regs ); - sprintfW( caption, fmtW, arch, (regs[0] & (15 << 8)) >> 8, (regs[0] & (15 << 4)) >> 4, regs[0] & 15 ); + + model = get_processor_model( regs[0], &stepping, &family ); + sprintfW( caption, fmtW, arch, family, model, stepping ); } static void get_processor_version( WCHAR *version ) { static const WCHAR fmtW[] = {'M','o','d','e','l',' ','%','u',',',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; - unsigned int regs[4] = {0, 0, 0, 0}; + unsigned int regs[4] = {0, 0, 0, 0}, model, stepping; do_cpuid( 1, regs ); - sprintfW( version, fmtW, (regs[0] & (15 << 4)) >> 4, regs[0] & 15 ); + + model = get_processor_model( regs[0], &stepping, NULL ); + sprintfW( version, fmtW, model, stepping ); } static UINT16 get_processor_revision(void) {

1 0

Hans Leidekker : wbemprox: Strip trailing spaces from processor name.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: d1f70b17e6e3d8c53be7ca3453719b87b66d7598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1f70b17e6e3d8c53be7ca34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:11 2019 +0100 wbemprox: Strip trailing spaces from processor name. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7893aa1..87cdc0a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2907,6 +2907,7 @@ static void get_processor_manufacturer( WCHAR *manufacturer ) static void get_processor_name( WCHAR *name ) { unsigned int regs[4] = {0, 0, 0, 0}; + int i; do_cpuid( 0x80000000, regs ); if (regs[0] >= 0x80000004) @@ -2918,6 +2919,7 @@ static void get_processor_name( WCHAR *name ) do_cpuid( 0x80000004, regs ); regs_to_str( regs, 16, name + 32 ); } + for (i = strlenW(name) - 1; i >= 0 && name[i] == ' '; i--) name[i] = 0; } static UINT get_processor_currentclockspeed( UINT index ) {

1 0

Hans Leidekker : wbemprox: Support cpuid on 64-bit.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 48554a2645b873b43cdbe7a70aec2b47080a7476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48554a2645b873b43cdbe7a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 10:44:10 2019 +0100 wbemprox: Support cpuid on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 49 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d3efd99..7893aa1 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2804,21 +2804,44 @@ done: return status; } -static inline void do_cpuid( unsigned int ax, unsigned int *p ) -{ -#ifdef __i386__ -#ifdef _MSC_VER - __cpuid(p, ax); +extern void do_cpuid( unsigned int ax, unsigned int *p ); +#if defined(_MSC_VER) +void do_cpuid( unsigned int ax, unsigned int *p ) +{ + __cpuid( p, ax ); +} +#elif defined(__i386__) +__ASM_GLOBAL_FUNC( do_cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ) +#elif defined(__x86_64__) +__ASM_GLOBAL_FUNC( do_cpuid, + "pushq %rbx\n\t" + "movl %edi,%eax\n\t" + "cpuid\n\t" + "movl %eax,(%rsi)\n\t" + "movl %ebx,4(%rsi)\n\t" + "movl %ecx,8(%rsi)\n\t" + "movl %edx,12(%rsi)\n\t" + "popq %rbx\n\t" + "ret" ) #else - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif -#endif +void do_cpuid( unsigned int ax, unsigned int *p ) +{ + FIXME("\n"); } +#endif + static const WCHAR *get_osarchitecture(void) { SYSTEM_INFO info;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
50
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 January 2019