September 2012 - Wine-Commits

Dan Kegel : vcomp: Add better stub for omp_get_num_procs.
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

Module: wine Branch: master Commit: d97d3425857ac533e154571479386e1e58c75e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97d3425857ac533e15457147… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Sep 4 08:27:33 2012 -0700 vcomp: Add better stub for omp_get_num_procs. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index be14c02..82c8c94 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +int CDECL omp_get_num_procs(void) +{ + TRACE("stub\n"); + return 1; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 7ffbf82..7a701ef 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -93,7 +93,7 @@ @ stub omp_get_dynamic @ stub omp_get_max_threads @ stub omp_get_nested -@ stub omp_get_num_procs +@ cdecl omp_get_num_procs() @ stub omp_get_num_threads @ stub omp_get_thread_num @ stub omp_get_wtick

1 0

Erich Hoover : hhctrl.ocx: Do not permit a NULL caption for HtmlHelp windows.
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

Module: wine Branch: master Commit: a61903388eb11a8c5c5e4929ebdcaccedd67430f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61903388eb11a8c5c5e4929e… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Sep 5 10:36:39 2012 -0600 hhctrl.ocx: Do not permit a NULL caption for HtmlHelp windows. --- dlls/hhctrl.ocx/chm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index bff7186..88bd6e5 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -366,10 +366,8 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) wintype.cbStruct = sizeof(wintype); wintype.fUniCodeStrings = TRUE; wintype.pszType = pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); - wintype.pszFile = pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); wintype.pszToc = pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null); wintype.pszIndex = pszIndex = strdupW(null); - wintype.pszCaption = pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); wintype.fsValidMembers = 0; wintype.fsWinProperties = HHWIN_PROP_TRI_PANE; wintype.dwStyles = WS_POPUP; @@ -380,12 +378,14 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) /* merge the new data with any pre-existing HH_WINTYPE structure */ MergeChmProperties(&wintype, info, FALSE); + if (!info->WinType.pszCaption) + info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); if (!info->WinType.pszFile) - info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); + info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); if (!info->WinType.pszToc) - info->WinType.pszToc = info->stringsW.pszToc = FindHTMLHelpSetting(info, toc_extW); + info->WinType.pszToc = info->stringsW.pszToc = FindHTMLHelpSetting(info, toc_extW); if (!info->WinType.pszIndex) - info->WinType.pszIndex = info->stringsW.pszIndex = FindHTMLHelpSetting(info, index_extW); + info->WinType.pszIndex = info->stringsW.pszIndex = FindHTMLHelpSetting(info, index_extW); heap_free(pszType); heap_free(pszFile);

1 0

Henri Verbeet : wined3d: Read complete shader instructions at a time.
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

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 Sept. 5, 2012

Sept. 5, 2012

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

Piotr Caban : ntdll: Added processor cores information to SystemLogicalProcessorInformation ( Mac).
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

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

Piotr Caban : ntdll: Added numa node information to SystemLogicalProcessorInformation (Mac).
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

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

Jason Edmeades : cmd: Fix "PATH=value" command.
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

Module: wine Branch: master Commit: 4f71f4af59b8989b2288800a7b337f61475df505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f71f4af59b8989b2288800a7… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 4 00:30:17 2012 +0100 cmd: Fix "PATH=value" command. --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 16f4eff..b2546d4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2371,7 +2371,7 @@ void WCMD_setshow_path (const WCHAR *command) { static const WCHAR pathW[] = {'P','A','T','H','\0'}; static const WCHAR pathEqW[] = {'P','A','T','H','=','\0'}; - if (strlenW(param1) == 0) { + if (strlenW(param1) == 0 && strlenW(param2) == 0) { status = GetEnvironmentVariableW(pathW, string, sizeof(string)/sizeof(WCHAR)); if (status != 0) { WCMD_output_asis ( pathEqW); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 13b53c5..093cc23 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1530,6 +1530,17 @@ if d==d goto dest4 :dest4(a)space@ echo goto with a following space worked +echo ------------ Testing PATH ------------ +set backup_path=%path% +set path=original +path +path try2 +path +path=try3 +path +set path=%backup_path% +set backup_path= + echo ------------ Testing combined CALLs/GOTOs ------------ echo @echo off>foo.cmd echo goto :eof>>foot.cmd diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b7bcd96..93b11e5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -825,6 +825,10 @@ goto with no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked +------------ Testing PATH ------------ +PATH=original +PATH=try2 +PATH=try3 ------------ Testing combined CALLs/GOTOs ------------ world cheball

1 0

Piotr Caban : ntdll: Added processor cache to SystemLogicalProcessorInformation (Mac).
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

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

Henri Verbeet : wined3d: Just return the swapchain from wined3d_device_get_swapchain().
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

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

Michael Stefaniuc : opengl32: Move the opengl_ext. h include before the other Wine headers.
by Alexandre Julliard Sept. 5, 2012

Sept. 5, 2012

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