May 2012 - Wine-commits - list.winehq.org

Hans Leidekker : fusion: Add a helper to retrieve the runtime version for an assembly.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 2ed8056a2bfb0ed835bac33d4121a38795cd023f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed8056a2bfb0ed835bac33d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:24:21 2012 +0200 fusion: Add a helper to retrieve the runtime version for an assembly. --- dlls/fusion/assembly.c | 8 +++++++- dlls/fusion/fusionpriv.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index a3abc4e..418d3b1 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -567,7 +567,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size); - /* we don't care about the version string */ + assembly->metadatahdr->Version = (LPSTR)&metadatahdr->Version; ofs = FIELD_OFFSET(METADATAHDR, Flags); ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1; @@ -901,3 +901,9 @@ done: return hr; } + +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) +{ + *version = assembly->metadatahdr->Version; + return S_OK; +} diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 8d51f5d..a262d72 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -435,6 +435,7 @@ HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDE HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN; BYTE assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : fusion: Use the PEKIND type where appropriate.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 08cbe5d26f112c5ebae579d3364a98a3da358b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08cbe5d26f112c5ebae579d33… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:24:41 2012 +0200 fusion: Use the PEKIND type where appropriate. --- dlls/fusion/asmcache.c | 13 +++++++++++-- dlls/fusion/assembly.c | 4 ++-- dlls/fusion/fusionpriv.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index c6f7ca9..fdf8ab5 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -94,7 +94,7 @@ static BOOL create_full_path(LPCWSTR path) return ret; } -static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) +static BOOL get_assembly_directory(LPWSTR dir, DWORD size, PEKIND architecture) { static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0}; @@ -107,6 +107,9 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) switch (architecture) { + case peNone: + break; + case peMSIL: strcatW(dir, msil); break; @@ -118,6 +121,10 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) case peAMD64: strcatW(dir, amd64); break; + + default: + WARN("unhandled architecture %u\n", architecture); + return FALSE; } return TRUE; @@ -372,6 +379,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, WCHAR path[MAX_PATH]; WCHAR asmdir[MAX_PATH]; LPWSTR ext; + PEKIND architecture; HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, @@ -410,7 +418,8 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, cache_lock( cache ); - get_assembly_directory(asmdir, MAX_PATH, assembly_get_architecture(assembly)); + architecture = assembly_get_architecture(assembly); + get_assembly_directory(asmdir, MAX_PATH, architecture); sprintfW(path, format, asmdir, name, version, token); diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 418d3b1..46c4db4 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -811,10 +811,10 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) return S_OK; } -BYTE assembly_get_architecture(ASSEMBLY *assembly) +PEKIND assembly_get_architecture(ASSEMBLY *assembly) { if ((assembly->corhdr->MajorRuntimeVersion == 2) && (assembly->corhdr->MinorRuntimeVersion == 0)) - return 0; /* .NET 1.x assembly */ + return peNone; /* .NET 1.x assembly */ if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) return peAMD64; /* AMD64/IA64 assembly */ diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index a262d72..3d538e3 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -433,7 +433,7 @@ HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) DECLSPEC_HIDDEN; HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDEN; HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN; -BYTE assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +PEKIND assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : fusion: Add support for ASM_CACHE_ROOT_EX in GetCachePath.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: f408fa83eebce7c93160ae2502f66bcbbe9bc4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f408fa83eebce7c93160ae250… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:25:12 2012 +0200 fusion: Add support for ASM_CACHE_ROOT_EX in GetCachePath. --- dlls/fusion/fusion.c | 51 ++++++++++++++++++++++++------------------------- include/fusion.idl | 3 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index ad77233..6ace81f 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -90,32 +90,26 @@ static HRESULT get_corversion(LPWSTR version, DWORD size) HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, PDWORD pcchPath) { - WCHAR path[MAX_PATH]; - WCHAR windir[MAX_PATH]; - WCHAR version[MAX_PATH]; - DWORD len; - HRESULT hr = S_OK; - - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR assembly[] = {'a','s','s','e','m','b','l','y',0}; - static const WCHAR gac[] = {'G','A','C',0}; - static const WCHAR nativeimg[] = { - 'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; + static const WCHAR assembly[] = {'\\','a','s','s','e','m','b','l','y',0}; + static const WCHAR gac[] = {'\\','G','A','C',0}; + static const WCHAR nativeimg[] = {'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; + static const WCHAR dotnet[] = {'\\','M','i','c','r','o','s','o','f','t','.','N','E','T',0}; #ifdef _WIN64 static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','6','4',0}; #else static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','3','2',0}; #endif + WCHAR path[MAX_PATH], windir[MAX_PATH], version[MAX_PATH]; + DWORD len; + HRESULT hr = S_OK; TRACE("(%08x, %p, %p)\n", dwCacheFlags, pwzCachePath, pcchPath); if (!pcchPath) return E_INVALIDARG; - GetWindowsDirectoryW(windir, MAX_PATH); - lstrcpyW(path, windir); - lstrcatW(path, backslash); - lstrcatW(path, assembly); + len = GetWindowsDirectoryW(windir, MAX_PATH); + strcpyW(path, windir); switch (dwCacheFlags) { @@ -125,37 +119,42 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, if (FAILED(hr)) return hr; - sprintfW(path, zapfmt, windir, assembly, nativeimg, version); + len = sprintfW(path, zapfmt, windir, assembly + 1, nativeimg, version); break; } - case ASM_CACHE_GAC: { - lstrcatW(path, backslash); - lstrcatW(path, gac); + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + strcpyW(path + len, gac); + len += sizeof(gac)/sizeof(WCHAR) - 1; break; } - case ASM_CACHE_DOWNLOAD: { FIXME("Download cache not implemented\n"); return E_FAIL; } - case ASM_CACHE_ROOT: - break; /* already set */ - + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + break; + case ASM_CACHE_ROOT_EX: + strcpyW(path + len, dotnet); + len += sizeof(dotnet)/sizeof(WCHAR) - 1; + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + break; default: return E_INVALIDARG; } - len = lstrlenW(path) + 1; + len++; if (*pcchPath <= len || !pwzCachePath) hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); else if (pwzCachePath) - lstrcpyW(pwzCachePath, path); + strcpyW(pwzCachePath, path); *pcchPath = len; - return hr; } diff --git a/include/fusion.idl b/include/fusion.idl index d645662..cff1e6c 100644 --- a/include/fusion.idl +++ b/include/fusion.idl @@ -28,7 +28,8 @@ typedef enum ASM_CACHE_ZAP = 0x1, ASM_CACHE_GAC = 0x2, ASM_CACHE_DOWNLOAD = 0x4, - ASM_CACHE_ROOT = 0x8 + ASM_CACHE_ROOT = 0x8, + ASM_CACHE_ROOT_EX = 0x80 } ASM_CACHE_FLAGS; typedef enum

1 0

Detlef Riekenberg : ntdll: Implement NtGetCurrentProcessorNumber.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 02b74d3fd372ef6bb94d74590341a0b5b3f3dee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b74d3fd372ef6bb94d74590… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 17 19:28:31 2012 +0200 ntdll: Implement NtGetCurrentProcessorNumber. --- dlls/kernel32/kernel32.spec | 1 + dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 17 +++++++++++++++++ include/winbase.h | 2 ++ include/winnt.h | 7 +++++++ 5 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9b786a9..e5a70cf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -498,6 +498,7 @@ @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentProcess() @ stdcall GetCurrentProcessId() +@ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber @ stdcall GetCurrentThread() @ stdcall GetCurrentThreadId() @ stdcall GetDateFormatA(long long ptr str ptr long) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd9d41e..cff7081 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -176,6 +176,7 @@ @ stdcall NtFreeVirtualMemory(long ptr ptr long) @ stdcall NtFsControlFile(long long long long long long long long long long) @ stdcall NtGetContextThread(long ptr) +@ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index e328c5f..a0d414a 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1173,3 +1173,20 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, return STATUS_NOT_IMPLEMENTED; } } + +/****************************************************************************** + * NtGetCurrentProcessorNumber (NTDLL.@) + * + * Return the processor, on which the thread is running + * + */ +ULONG WINAPI NtGetCurrentProcessorNumber(void) +{ + + if (NtCurrentTeb()->Peb->NumberOfProcessors > 1) { + FIXME("need multicore support (%d processors)\n", NtCurrentTeb()->Peb->NumberOfProcessors); + } + + /* fallback to the first processor */ + return 0; +} diff --git a/include/winbase.h b/include/winbase.h index 2cb3d1a..8b5805c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1634,6 +1634,8 @@ WINADVAPI BOOL WINAPI GetCurrentHwProfileA(LPHW_PROFILE_INFOA); WINADVAPI BOOL WINAPI GetCurrentHwProfileW(LPHW_PROFILE_INFOW); #define GetCurrentHwProfile WINELIB_NAME_AW(GetCurrentHwProfile) WINBASEAPI HANDLE WINAPI GetCurrentProcess(void); +WINBASEAPI DWORD WINAPI GetCurrentProcessorNumber(void); +WINBASEAPI VOID WINAPI GetCurrentProcessorNumberEx(PPROCESSOR_NUMBER); WINBASEAPI HANDLE WINAPI GetCurrentThread(void); #define GetCurrentTime() GetTickCount() WINBASEAPI BOOL WINAPI GetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,LPDWORD); diff --git a/include/winnt.h b/include/winnt.h index 9bde031..02c92e6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5286,6 +5286,13 @@ typedef struct _GROUP_AFFINITY WORD Reserved[3]; } GROUP_AFFINITY, *PGROUP_AFFINITY; +typedef struct _PROCESSOR_NUMBER +{ + WORD Group; + BYTE Number; + BYTE Reserved; +} PROCESSOR_NUMBER, *PPROCESSOR_NUMBER; + typedef struct _PROCESSOR_RELATIONSHIP { BYTE Flags;

1 0

Detlef Riekenberg : ntdll: Use ThreadAffinityMask for NtGetCurrentProcessorNumber.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 1f80bacc659ef3472f6baf6c1bd535b48e456592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f80bacc659ef3472f6baf6c1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 17 19:28:33 2012 +0200 ntdll: Use ThreadAffinityMask for NtGetCurrentProcessorNumber. --- dlls/ntdll/thread.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index a0d414a..b34e279 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1182,9 +1182,29 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, */ ULONG WINAPI NtGetCurrentProcessorNumber(void) { + ULONG processor; - if (NtCurrentTeb()->Peb->NumberOfProcessors > 1) { - FIXME("need multicore support (%d processors)\n", NtCurrentTeb()->Peb->NumberOfProcessors); + if (NtCurrentTeb()->Peb->NumberOfProcessors > 1) + { + ULONG_PTR thread_mask, processor_mask; + NTSTATUS status; + + status = NtQueryInformationThread(GetCurrentThread(), ThreadAffinityMask, + &thread_mask, sizeof(thread_mask), NULL); + if (status == STATUS_SUCCESS) + { + for (processor = 0; processor < NtCurrentTeb()->Peb->NumberOfProcessors; processor++) + { + processor_mask = (1 << processor); + if (thread_mask & processor_mask) + { + if (thread_mask != processor_mask) + FIXME("need multicore support (%d processors)\n", + NtCurrentTeb()->Peb->NumberOfProcessors); + return processor; + } + } + } } /* fallback to the first processor */

1 0

Detlef Riekenberg : ntdll/tests: Add tests for NtGetCurrentProcessorNumber.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 0e235e5dc6fc0248237bb0bf1c0ae0b1ee38b971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e235e5dc6fc0248237bb0bf1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 17 19:28:34 2012 +0200 ntdll/tests: Add tests for NtGetCurrentProcessorNumber. --- dlls/ntdll/tests/info.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 440f602..1b14950 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -33,7 +33,8 @@ static NTSTATUS (WINAPI * pNtCreateSection)(HANDLE*,ACCESS_MASK,const OBJECT_ATT static NTSTATUS (WINAPI * pNtMapViewOfSection)(HANDLE,HANDLE,PVOID*,ULONG,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); static NTSTATUS (WINAPI * pNtUnmapViewOfSection)(HANDLE,PVOID); static NTSTATUS (WINAPI * pNtClose)(HANDLE); -static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); +static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); static BOOL is_wow64; @@ -72,6 +73,9 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtMapViewOfSection); NTDLL_GET_PROC(NtUnmapViewOfSection); + /* not present before XP */ + pNtGetCurrentProcessorNumber = (void *) GetProcAddress(hntdll, "NtGetCurrentProcessorNumber"); + pIsWow64Process = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; return TRUE; @@ -1391,6 +1395,63 @@ static void test_affinity(void) "Unexpected thread affinity\n" ); } +static void test_NtGetCurrentProcessorNumber(void) +{ + NTSTATUS status; + SYSTEM_INFO si; + PROCESS_BASIC_INFORMATION pbi; + THREAD_BASIC_INFORMATION tbi; + DWORD_PTR old_process_mask; + DWORD_PTR old_thread_mask; + DWORD_PTR new_mask; + ULONG current_cpu; + ULONG i; + + if (!pNtGetCurrentProcessorNumber) { + win_skip("NtGetCurrentProcessorNumber not available\n"); + return; + } + + GetSystemInfo(&si); + current_cpu = pNtGetCurrentProcessorNumber(); + trace("dwNumberOfProcessors: %d, current processor: %d\n", si.dwNumberOfProcessors, current_cpu); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL); + old_process_mask = (DWORD_PTR)pbi.Reserved2[0]; + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + + status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL); + old_thread_mask = tbi.AffinityMask; + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + + /* allow the test to run on all processors */ + new_mask = (1 << si.dwNumberOfProcessors) - 1; + status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &new_mask, sizeof(new_mask)); + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + + for (i = 0; i < si.dwNumberOfProcessors; i++) + { + new_mask = 1 << i; + status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &new_mask, sizeof(new_mask)); + ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status); + + status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL); + ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status); + + current_cpu = pNtGetCurrentProcessorNumber(); + ok((current_cpu == i), "%d (new_mask 0x%lx): running on processor %d (AffinityMask: 0x%lx)\n", + i, new_mask, current_cpu, tbi.AffinityMask); + } + + /* restore old values */ + status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &old_process_mask, sizeof(old_process_mask)); + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + + status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &old_thread_mask, sizeof(old_thread_mask)); + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); +} + + START_TEST(info) { char **argv; @@ -1502,4 +1563,5 @@ START_TEST(info) trace("Starting test_affinity()\n"); test_affinity(); + test_NtGetCurrentProcessorNumber(); }

1 0

Detlef Riekenberg : ntdll: Read the current processor with the __NR_getcpu syscall.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 979099a441682c99ee0c1ee1fab5e1de635a579c URL: http://source.winehq.org/git/wine.git/?a=commit;h=979099a441682c99ee0c1ee1f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 18 01:03:31 2012 +0200 ntdll: Read the current processor with the __NR_getcpu syscall. --- dlls/ntdll/thread.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b34e279..881d961 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -30,6 +30,9 @@ #ifdef HAVE_SYS_TIMES_H #include <sys/times.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif #define NONAMELESSUNION #include "ntstatus.h" @@ -1184,6 +1187,11 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void) { ULONG processor; +#if defined(__linux__) && defined(__NR_getcpu) + int res = syscall(__NR_getcpu, &processor); + if (res != -1) return processor; +#endif + if (NtCurrentTeb()->Peb->NumberOfProcessors > 1) { ULONG_PTR thread_mask, processor_mask;

1 0

Józef Kucia : d3dx9: Correctly handle D3DUSAGE_AUTOGENMIPMAP in D3DXCheckTextureRequirements.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: dfc085b684a23ccd7593b07b8777f495d4258a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc085b684a23ccd7593b07b8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:08 2012 +0200 d3dx9: Correctly handle D3DUSAGE_AUTOGENMIPMAP in D3DXCheckTextureRequirements. --- dlls/d3dx9_36/tests/texture.c | 56 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 7 ++++- 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 5663bfa..80311e6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -85,6 +85,29 @@ static const unsigned char dds_volume_map[] = { 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab }; +static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) +{ + HRESULT hr; + D3DCAPS9 caps; + IDirect3D9 *d3d9; + D3DDISPLAYMODE mode; + D3DDEVICE_CREATION_PARAMETERS params; + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + IDirect3DDevice9_GetDirect3D(device, &d3d9); + IDirect3DDevice9_GetCreationParameters(device, &params); + IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + + if (!(caps.Caps2 & D3DCAPS2_CANAUTOGENMIPMAP)) + return FALSE; + + hr = IDirect3D9_CheckDeviceFormat(d3d9, params.AdapterOrdinal, params.DeviceType, + mode.Format, D3DUSAGE_AUTOGENMIPMAP, resource_type, D3DFMT_A8R8G8B8); + + IDirect3D9_Release(d3d9); + return SUCCEEDED(hr); +} + static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) { UINT width, height, mipmaps; @@ -199,6 +222,29 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + /* mipmaps when D3DUSAGE_AUTOGENMIPMAP is set */ + if (is_autogenmipmap_supported(device, D3DRTYPE_TEXTURE)) + { + mipmaps = 0; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + mipmaps = 2; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + mipmaps = 6; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + } + else + skip("No D3DUSAGE_AUTOGENMIPMAP support for textures\n"); + /* usage */ hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_WRITEONLY, NULL, D3DPOOL_DEFAULT); ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements succeeded, but should've failed.\n"); @@ -322,6 +368,16 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + if (is_autogenmipmap_supported(device, D3DRTYPE_CUBETEXTURE)) + { + mipmaps = 3; + hr = D3DXCheckCubeTextureRequirements(device, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + } + else + skip("No D3DUSAGE_AUTOGENMIPMAP support for cube textures\n"); + /* usage */ hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, D3DUSAGE_WRITEONLY, NULL, D3DPOOL_DEFAULT); ok(hr == D3DERR_INVALIDCALL, "D3DXCheckCubeTextureRequirements succeeded, but should've failed.\n"); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 6a33547..89cc078 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -216,7 +216,12 @@ HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, *height = h; /* miplevels */ - if (miplevels) + if (miplevels && (usage & D3DUSAGE_AUTOGENMIPMAP)) + { + if (*miplevels > 1) + *miplevels = 0; + } + else if (miplevels) { UINT max_mipmaps = 1;

1 0

Józef Kucia : d3dx9: Correctly handle D3DUSAGE_AUTOGENMIPMAP in D3DXCheckVolumeTextureRequirements .
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 7d07f1f2f6e043c1ec2ad6d73056234d07a02229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d07f1f2f6e043c1ec2ad6d73… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:09 2012 +0200 d3dx9: Correctly handle D3DUSAGE_AUTOGENMIPMAP in D3DXCheckVolumeTextureRequirements. --- dlls/d3dx9_36/tests/texture.c | 20 ++++++++++++++++++++ dlls/d3dx9_36/texture.c | 5 +++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 80311e6..79e4023 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -517,6 +517,26 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + + if (!is_autogenmipmap_supported(device, D3DRTYPE_VOLUMETEXTURE)) + { + skip("No D3DUSAGE_AUTOGENMIPMAP support for volume textures\n"); + return; + } + + /* mipmaps when D3DUSAGE_AUTOGENMIPMAP is set */ + mipmaps = 0; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + mipmaps = 1; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + mipmaps = 3; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); } static void test_D3DXCreateTexture(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 89cc078..377e4f6 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -436,6 +436,11 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(LPDIRECT3DDEVICE9 device, { if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP)) *miplevels = 1; + else if ((usage & D3DUSAGE_AUTOGENMIPMAP)) + { + if (*miplevels > 1) + *miplevels = 0; + } else { UINT max_mipmaps = 1;

1 0

Józef Kucia : d3dx9: Use actual level count for computing the number of loaded mipmaps.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 1a4f1edf3233d476e7441da1903f19ca8c1fd8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4f1edf3233d476e7441da19… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:10 2012 +0200 d3dx9: Use actual level count for computing the number of loaded mipmaps. --- dlls/d3dx9_36/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 377e4f6..8ca42c5 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -636,7 +636,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return hr; } - loaded_miplevels = min(miplevels, imginfo.MipLevels); + loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels); hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, loaded_miplevels - 1, mipfilter); if (FAILED(hr)) @@ -1209,7 +1209,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, return hr; } - loaded_miplevels = min(mip_levels, img_info.MipLevels); + loaded_miplevels = min(IDirect3DCubeTexture9_GetLevelCount(tex), img_info.MipLevels); hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, palette, loaded_miplevels - 1, mip_filter); if (FAILED(hr)) {

1 0