wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Piotr Caban : ntdll: Added processor cache to SystemLogicalProcessorInformation (Mac).
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 682b276ac58b185d567c1026cbf1cbb9addc37b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682b276ac58b185d567c1026c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 5 12:01:28 2012 +0200 ntdll: Added processor cache to SystemLogicalProcessorInformation (Mac). --- dlls/ntdll/nt.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6f2635d..2536d33 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1609,10 +1609,12 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** #elif defined(__APPLE__) static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) { - DWORD len = 0, i, j; - DWORD cores_no, lcpu_no, lcpu_per_core, cores_per_package; + DWORD len = 0, i, j, k; + DWORD cores_no, lcpu_no, lcpu_per_core, cores_per_package, assoc; size_t size; ULONG_PTR mask; + LONGLONG cache_size, cache_line_size, cache_sharing[10]; + CACHE_DESCRIPTOR cache[4]; lcpu_no = NtCurrentTeb()->Peb->NumberOfProcessors; @@ -1648,6 +1650,71 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** len++; } + memset(cache, 0, sizeof(cache)); + cache[0].Level = 1; + cache[0].Type = CacheInstruction; + cache[1].Level = 1; + cache[1].Type = CacheData; + cache[2].Level = 2; + cache[2].Type = CacheUnified; + cache[3].Level = 3; + cache[3].Type = CacheUnified; + + size = sizeof(cache_line_size); + if(!sysctlbyname("hw.cachelinesize", &cache_line_size, &size, NULL, 0)) + { + for(i=0; i<4; i++) + cache[i].LineSize = cache_line_size; + } + + /* TODO: set associativity for all caches */ + size = sizeof(assoc); + if(!sysctlbyname("machdep.cpu.cache.L2_associativity", &assoc, &size, NULL, 0)) + cache[2].Associativity = assoc; + + size = sizeof(cache_size); + if(!sysctlbyname("hw.l1icachesize", &cache_size, &size, NULL, 0)) + cache[0].Size = cache_size; + size = sizeof(cache_size); + if(!sysctlbyname("hw.l1dcachesize", &cache_size, &size, NULL, 0)) + cache[1].Size = cache_size; + size = sizeof(cache_size); + if(!sysctlbyname("hw.l2cachesize", &cache_size, &size, NULL, 0)) + cache[2].Size = cache_size; + size = sizeof(cache_size); + if(!sysctlbyname("hw.l3cachesize", &cache_size, &size, NULL, 0)) + cache[3].Size = cache_size; + + size = sizeof(cache_sharing); + if(!sysctlbyname("hw.cacheconfig", cache_sharing, &size, NULL, 0)) + { + for(i=1; i<4 && i<size/sizeof(*cache_sharing); i++) + { + if(!cache_sharing[i] || !cache[i].Size) + continue; + + for(j=0; j<lcpu_no/cache_sharing[i]; j++) + { + mask = 0; + for(k=j*cache_sharing[i]; k<lcpu_no && k<(j+1)*cache_sharing[i]; k++) + mask |= (ULONG_PTR)1<<k; + + if(i==1 && cache[0].Size) + { + (*data)[len].Relationship = RelationCache; + (*data)[len].ProcessorMask = mask; + (*data)[len].u.Cache = cache[0]; + len++; + } + + (*data)[len].Relationship = RelationCache; + (*data)[len].ProcessorMask = mask; + (*data)[len].u.Cache = cache[i]; + len++; + } + } + } + mask = 0; for(i=0; i<lcpu_no; i++) mask |= (ULONG_PTR)1<<i;

1 0

Piotr Caban : ntdll: Added numa node information to SystemLogicalProcessorInformation (Mac).
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 785fde5920511c6f531d1baa2134acd301b0b22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=785fde5920511c6f531d1baa2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 5 12:01:15 2012 +0200 ntdll: Added numa node information to SystemLogicalProcessorInformation (Mac). --- dlls/ntdll/nt.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0b01010..6f2635d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1648,6 +1648,14 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** len++; } + mask = 0; + for(i=0; i<lcpu_no; i++) + mask |= (ULONG_PTR)1<<i; + (*data)[len].Relationship = RelationNumaNode; + (*data)[len].ProcessorMask = mask; + (*data)[len].u.NumaNode.NodeNumber = 0; + len++; + *max_len = len * sizeof(**data); return STATUS_SUCCESS; }

1 0

Piotr Caban : ntdll: Added processor cores information to SystemLogicalProcessorInformation ( Mac).
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 6c2b7332d376cfb050199a12f5f24f2b3656588d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2b7332d376cfb050199a12f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 5 12:00:55 2012 +0200 ntdll: Added processor cores information to SystemLogicalProcessorInformation (Mac). --- dlls/ntdll/nt.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 863844a..0b01010 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1606,6 +1606,51 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** *max_len = len * sizeof(**data); return STATUS_SUCCESS; } +#elif defined(__APPLE__) +static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) +{ + DWORD len = 0, i, j; + DWORD cores_no, lcpu_no, lcpu_per_core, cores_per_package; + size_t size; + ULONG_PTR mask; + + lcpu_no = NtCurrentTeb()->Peb->NumberOfProcessors; + + size = sizeof(cores_no); + if(sysctlbyname("machdep.cpu.core_count", &cores_no, &size, NULL, 0)) + cores_no = lcpu_no; + + lcpu_per_core = lcpu_no/cores_no; + for(i=0; i<cores_no; i++) + { + mask = 0; + for(j=lcpu_per_core*i; j<lcpu_per_core*(i+1); j++) + mask |= (ULONG_PTR)1<<j; + + (*data)[len].Relationship = RelationProcessorCore; + (*data)[len].ProcessorMask = mask; + (*data)[len].u.ProcessorCore.Flags = 0; /* TODO */ + len++; + } + + size = sizeof(cores_per_package); + if(sysctlbyname("machdep.cpu.cores_per_package", &cores_per_package, &size, NULL, 0)) + cores_per_package = lcpu_no; + + for(i=0; i<(lcpu_no+cores_per_package-1)/cores_per_package; i++) + { + mask = 0; + for(j=cores_per_package*i; j<cores_per_package*(i+1) && j<lcpu_no; j++) + mask |= (ULONG_PTR)1<<j; + + (*data)[len].Relationship = RelationProcessorPackage; + (*data)[len].ProcessorMask = mask; + len++; + } + + *max_len = len * sizeof(**data); + return STATUS_SUCCESS; +} #else static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) {

1 0

Michael Stefaniuc : opengl32: Avoid conflicting defines for GLAPI / WINGDIAPI.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 4076e0eb129ad9ef23be6749db5807f5430e4f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4076e0eb129ad9ef23be6749d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 5 10:57:34 2012 +0200 opengl32: Avoid conflicting defines for GLAPI / WINGDIAPI. --- dlls/opengl32/opengl_ext.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index d84ec0d..eb35e54 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -19,17 +19,15 @@ #ifndef __DLLS_OPENGL32_OPENGL_EXT_H #define __DLLS_OPENGL32_OPENGL_EXT_H -#undef APIENTRY -#undef CALLBACK -#undef WINAPI - #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ #include <GL/gl.h> #undef XMD_H #undef APIENTRY #undef CALLBACK +#undef GLAPI #undef WINAPI +#undef WINGDIAPI /* Redefines the constants */ #define CALLBACK __stdcall

1 0

Michael Stefaniuc : opengl32: Move the opengl_ext. h include before the other Wine headers.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 6a6806944c520dc4b532213d2e30419dd856dc06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6806944c520dc4b532213d2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 5 10:55:19 2012 +0200 opengl32: Move the opengl_ext.h include before the other Wine headers. --- dlls/opengl32/wgl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index bcf398d..e5a1bae 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> +#include "opengl_ext.h" #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -33,7 +34,6 @@ #include "winternl.h" #include "winnt.h" -#include "opengl_ext.h" #define WGL_WGLEXT_PROTOTYPES #include "wine/wglext.h" #include "wine/gdi_driver.h"

1 0

Henri Verbeet : wined3d: Just return the swapchain from wined3d_device_get_swapchain().
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 8fd7d3a2b38132dd03e918a3714bf55e066c2acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd7d3a2b38132dd03e918a37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 20:15:10 2012 +0200 wined3d: Just return the swapchain from wined3d_device_get_swapchain(). --- dlls/d3d9/device.c | 8 ++-- dlls/ddraw/ddraw.c | 8 ++-- dlls/dxgi/factory.c | 9 ++-- dlls/wined3d/device.c | 119 ++++++++++----------------------------------- dlls/wined3d/stateblock.c | 5 +-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 +- 7 files changed, 42 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fd7d3a2b38132dd03e91…

1 0

Henri Verbeet : wined3d: Add type information to shader registers.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: ac5c420c916628aa4eaabccee7282d40111427eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5c420c916628aa4eaabccee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 20:15:09 2012 +0200 wined3d: Add type information to shader registers. --- dlls/wined3d/shader.c | 44 +++++++++++- dlls/wined3d/shader_sm1.c | 17 ++++-- dlls/wined3d/shader_sm4.c | 141 ++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 10 +++ 4 files changed, 149 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac5c420c916628aa4eaab…

1 0

Henri Verbeet : wined3d: Read complete shader instructions at a time.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 42582ada009d8e1720768e95c2fc444414906e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42582ada009d8e1720768e95c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 20:15:08 2012 +0200 wined3d: Read complete shader instructions at a time. --- dlls/wined3d/shader.c | 235 ++++++++++++---------------------------- dlls/wined3d/shader_sm1.c | 126 +++++++++++++++------ dlls/wined3d/shader_sm4.c | 99 ++++++++++-------- dlls/wined3d/wined3d_private.h | 26 ++--- 4 files changed, 224 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42582ada009d8e1720768…

1 0

Vincent Povirk : mscoree: Add support for tracing the entry point assembly.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: f2437c2b328ca4061cfcb5615a3e96073bf109f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2437c2b328ca4061cfcb5615… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 4 11:32:00 2012 -0500 mscoree: Add support for tracing the entry point assembly. --- dlls/mscoree/corruntimehost.c | 2 ++ dlls/mscoree/metahost.c | 1 + dlls/mscoree/mscoree_private.h | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ffc204d..ecefe75 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1073,6 +1073,8 @@ __int32 WINAPI _CorExeMain(void) if (assembly) { + host->mono->mono_trace_set_assembly(assembly); + exit_code = host->mono->mono_jit_exec(domain, assembly, argc, argv); } else diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 8417344..66dde5d 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -207,6 +207,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); + LOAD_MONO_FUNCTION(mono_trace_set_assembly); /* GLib imports obsoleted by the 2.0 ABI */ if (This->mono_abi_version == 1) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 7266687..f7e9c11 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -175,6 +175,7 @@ struct loaded_mono void (CDECL *mono_thread_pool_cleanup)(void); void (CDECL *mono_thread_suspend_all_other_threads)(void); void (CDECL *mono_threads_set_shutting_down)(void); + void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); };

1 0

Nikolay Sivov : user32: Release uniscribe data on Edit control destruction (valgrind).
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 6b1946154831c4537b9fffc4994cb0273db55918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1946154831c4537b9fffc49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 4 23:06:17 2012 +0400 user32: Release uniscribe data on Edit control destruction (valgrind). --- dlls/user32/edit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 226d737..278aa38 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4601,6 +4601,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) pc = pp; } + EDIT_InvalidateUniscribeData(es); SetWindowLongPtrW( es->hwndSelf, 0, 0 ); HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es);

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
83
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 September 2012