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

Detlef Riekenberg : ntdll/tests: Add tests for NtGetCurrentProcessorNumber.
by Alexandre Julliard May 21, 2012

May 21, 2012

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

Józef Kucia : d3dx9/tests: Use more common formats for surfaces in DXTn tests.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 4d462adef90511812cc1f54ff1345a1537ac4d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d462adef90511812cc1f54ff… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:15 2012 +0200 d3dx9/tests: Use more common formats for surfaces in DXTn tests. --- dlls/d3dx9_36/tests/surface.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 8fefd0c..f8a29c3 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -853,7 +853,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) } /* DXT1, DXT2, DXT3, DXT4, DXT5 */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); if (FAILED(hr)) skip("Failed to create R8G8B8 surface, hr %#x.\n", hr); else @@ -861,7 +861,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, dds_24bit, sizeof(dds_24bit), NULL, D3DX_FILTER_NONE, 0, NULL); ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT2, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT2, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT2 surface, hr %#x.\n", hr); else @@ -871,7 +871,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT3, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT3, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT3 surface, hr %#x.\n", hr); else @@ -881,7 +881,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT4, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT4, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT4 surface, hr %#x.\n", hr); else @@ -891,7 +891,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT5 surface, hr %#x.\n", hr); else @@ -901,7 +901,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT1 surface, hr %#x.\n", hr); else

1 0

Józef Kucia : d3dx9/tests: Do not release a texture when it wasn't created.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 8061bec3af22b7ebf632d6b90a098d7a5cc84f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8061bec3af22b7ebf632d6b90… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:16 2012 +0200 d3dx9/tests: Do not release a texture when it wasn't created. --- dlls/d3dx9_36/tests/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index ff7c811..884d4e7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -765,12 +765,12 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 5, D3DX_FILTER_NONE); /* Invalid miplevel */ ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DTexture9_Release(tex); - hr = D3DXFilterTexture(NULL, NULL, 0, D3DX_FILTER_NONE); ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);

1 0

Józef Kucia : d3dx9: Correctly check if a cube texture is dynamic in D3DXCreateCubeTextureFromFileInMemoryEx .
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 480e4e5bfccb772f5b331406d7e592442105defa URL: http://source.winehq.org/git/wine.git/?a=commit;h=480e4e5bfccb772f5b331406d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:12 2012 +0200 d3dx9: Correctly check if a cube texture is dynamic in D3DXCreateCubeTextureFromFileInMemoryEx. --- dlls/d3dx9_36/tests/texture.c | 18 ++++++++++++++++++ dlls/d3dx9_36/texture.c | 4 +++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index f88ea75..a595671 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1290,6 +1290,23 @@ static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) } else skip("Couldn't create cube texture\n"); } +static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DCubeTexture9 *cube_texture; + + if (!is_autogenmipmap_supported(device, D3DRTYPE_CUBETEXTURE)) + { + skip("No D3DUSAGE_AUTOGENMIPMAP support for cube textures\n"); + return; + } + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT, + D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture); +} + static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *device) { HRESULT hr; @@ -1377,6 +1394,7 @@ START_TEST(texture) test_D3DXCreateTextureFromFileInMemory(device); test_D3DXCreateTextureFromFileInMemoryEx(device); test_D3DXCreateCubeTextureFromFileInMemory(device); + test_D3DXCreateCubeTextureFromFileInMemoryEx(device); test_D3DXCreateVolumeTextureFromFileInMemory(device); IDirect3DDevice9_Release(device); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2a4a300..750025c 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1124,6 +1124,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, D3DCAPS9 caps; UINT loaded_miplevels; D3DXIMAGE_INFO img_info; + BOOL dynamic_texture; BOOL file_size = FALSE; BOOL file_format = FALSE; BOOL file_mip_levels = FALSE; @@ -1191,7 +1192,8 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, mip_levels = img_info.MipLevels; } - if (pool == D3DPOOL_DEFAULT && !((caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && usage == D3DUSAGE_DYNAMIC)) + dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); + if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { hr = D3DXCreateCubeTexture(device, size, mip_levels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); tex = buftex;

1 0

Detlef Riekenberg : ntdll: Implement NtGetCurrentProcessorNumber.
by Alexandre Julliard May 21, 2012

May 21, 2012

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 May 21, 2012

May 21, 2012

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

Józef Kucia : d3dx9: Correctly check if a texture is dynamic in D3DXCreateTextureFromFileInMemoryEx .
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: eb55412f664ac07b6ff13e51d221ca26e3415448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb55412f664ac07b6ff13e51d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:11 2012 +0200 d3dx9: Correctly check if a texture is dynamic in D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/tests/texture.c | 11 +++++++++++ dlls/d3dx9_36/texture.c | 4 +++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 79e4023..f88ea75 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1238,6 +1238,17 @@ static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + + if (!is_autogenmipmap_supported(device, D3DRTYPE_TEXTURE)) + { + skip("No D3DUSAGE_AUTOGENMIPMAP support for textures\n"); + return; + } + + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_16bit, sizeof(dds_16bit), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, + D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); } static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8ca42c5..2a4a300 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -513,6 +513,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, IDirect3DSurface9 *surface; BOOL file_width = FALSE, file_height = FALSE; BOOL file_format = FALSE, file_miplevels = FALSE; + BOOL dynamic_texture; D3DXIMAGE_INFO imginfo; UINT loaded_miplevels; D3DCAPS9 caps; @@ -600,7 +601,8 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return D3DERR_INVALIDCALL; /* Create the to-be-filled texture */ - if (pool == D3DPOOL_DEFAULT && !((caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && usage == D3DUSAGE_DYNAMIC)) + dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); + if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { hr = D3DXCreateTexture(device, width, height, miplevels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); texptr = &buftex;

1 0

André Hentschel : Update German Contributing page
by Jeremy Newman May 21, 2012

May 21, 2012

Module: website Branch: master Commit: 94c9f1bed32e10ed37745e932a0b0166705ffe6b URL: http://source.winehq.org/git/website.git/?a=commit;h=94c9f1bed32e10ed37745e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 18 17:18:32 2012 +0200 Update German Contributing page --- templates/de/contributing.template | 317 ++++++++++++++++++------------------ 1 files changed, 159 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=94c9f1bed32e10ed37…

1 0

Aric Stewart : wineqtdecoder: Implement DataHGetFileSizeAsync.
by Alexandre Julliard May 18, 2012

May 18, 2012

Module: wine Branch: master Commit: 4948d343df7b834449f734ea924a2fea664a1868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4948d343df7b834449f734ea9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 18 09:25:04 2012 -0500 wineqtdecoder: Implement DataHGetFileSizeAsync. --- dlls/wineqtdecoder/qtdatahandler.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index cfcb676..cd32077 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -422,6 +422,33 @@ static pascal ComponentResult myDataHGetFileSize64(DataHandler dh, wide * fileSi return noErr; } +static pascal ComponentResult myDataHGetFileSizeAsync ( DataHandler dh, wide *fileSize, DataHCompletionUPP CompletionRtn, long RefCon ) +{ + Handle storage = GetComponentInstanceStorage(dh); + DHData *data = (DHData*)*storage; + LONGLONG total; + LONGLONG avaliable; + SInt64 total64; + + TRACE("%p\n",dh); + + IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + total64 = total; + *fileSize = SInt64ToWide(total64); + + if (CompletionRtn) + { + if (data->AsyncCompletionRtn) + InvokeDataHCompletionUPP(data->AsyncPtr, data->AsyncRefCon, noErr, data->AsyncCompletionRtn); + + data->AsyncPtr = (Ptr)fileSize; + data->AsyncRefCon = RefCon; + data->AsyncCompletionRtn = CompletionRtn; + } + + return noErr; +} + static pascal ComponentResult myDataHGetAvailableFileSize64(DataHandler dh, wide * fileSize) { Handle storage = GetComponentInstanceStorage(dh); @@ -610,7 +637,13 @@ static const struct { LPVOID proc; ProcInfoType type;} componentFunctions[] = {NULL, 0}, /* kDataHGetDataAvailabilitySelect */ {NULL, 0}, /* 0x0038 */ {NULL, 0}, /* 0x0039 */ - {NULL, 0}, /* kDataHGetFileSizeAsyncSelect */ + {myDataHGetFileSizeAsync, kPascalStackBased + | RESULT_SIZE(SIZE_CODE(sizeof(ComponentResult))) + | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(DataHandler))) + | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(wide*))) + | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(DataHCompletionUPP))) + | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(long))) +}, /* kDataHGetFileSizeAsyncSelect */ {NULL, 0}, /* kDataHGetDataRefAsTypeSelect */ {NULL, 0}, /* kDataHSetDataRefExtensionSelect */ {NULL, 0}, /* kDataHGetDataRefExtensionSelect */

1 0

Aric Stewart : wineqtdecoder: Implement a stub for DataHPlaybackHints64.
by Alexandre Julliard May 18, 2012

May 18, 2012

Module: wine Branch: master Commit: 6c51c1ba1310707a6380cac66aeb06b3f2f3994a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c51c1ba1310707a6380cac66… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 18 09:25:17 2012 -0500 wineqtdecoder: Implement a stub for DataHPlaybackHints64. --- dlls/wineqtdecoder/qtdatahandler.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index cd32077..f09014c 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -406,6 +406,22 @@ static pascal ComponentResult myDataHPlaybackHints(DataHandler dh, long flags, return noErr; } +static pascal ComponentResult myDataHPlaybackHints64(DataHandler dh, long flags, + wide *minFileOffset, wide *maxFileOffset, + long bytesPerSecond) +{ + if (TRACE_ON(qtdatahandler)) + { + SInt64 minFileOffset64 = WideToSInt64(*minFileOffset); + LONGLONG minFileOffsetLL = minFileOffset64; + SInt64 maxFileOffset64 = WideToSInt64(*maxFileOffset); + LONGLONG maxFileOffsetLL = maxFileOffset64; + + TRACE("%s %s %li\n",wine_dbgstr_longlong(minFileOffsetLL), wine_dbgstr_longlong(maxFileOffsetLL), bytesPerSecond); + } + return noErr; +} + static pascal ComponentResult myDataHGetFileSize64(DataHandler dh, wide * fileSize) { Handle storage = GetComponentInstanceStorage(dh); @@ -480,7 +496,7 @@ static pascal ComponentResult myDataHScheduleData64( DataHandler dh, LONGLONG offset = fileOffset64; BYTE* buffer = (BYTE*)PlaceToPutDataPtr; - TRACE("%p %p %lli %li %li %p %p\n",dh, PlaceToPutDataPtr, offset, DataSize, RefCon, scheduleRec, CompletionRtn); + TRACE("%p %p %s %li %li %p %p\n",dh, PlaceToPutDataPtr, wine_dbgstr_longlong(offset), DataSize, RefCon, scheduleRec, CompletionRtn); hr = IAsyncReader_SyncRead(data->dataRef.pReader, offset, DataSize, buffer); TRACE("result %x\n",hr); @@ -685,7 +701,14 @@ static const struct { LPVOID proc; ProcInfoType type;} componentFunctions_2[] = | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(unsigned long))) | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(long))) }, /* kDataHPlaybackHintsSelect 0x103 */ - {NULL, 0}, /* kDataHPlaybackHints64Select 0x10E */ + {myDataHPlaybackHints64, kPascalStackBased + | RESULT_SIZE(SIZE_CODE(sizeof(ComponentResult))) + | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(DataHandler))) + | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(long))) + | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(wide*))) + | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(wide*))) + | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(long))) +}, /* kDataHPlaybackHints64Select 0x10E */ {NULL, 0}, /* kDataHGetDataRateSelect 0x110 */ {NULL, 0}, /* kDataHSetTimeHintsSelect 0x111 */ }; @@ -726,6 +749,8 @@ static pascal ComponentResult myComponentCanDo(ComponentInstance ci, SInt16 ftnN return TRUE; if (ftnNumber == kDataHPlaybackHintsSelect) return TRUE; + if (ftnNumber == kDataHPlaybackHints64Select) + return TRUE; if (ftnNumber > kDataHGetDataAvailability64Select) return FALSE; TRACE("impl? %i\n",(componentFunctions[ftnNumber].proc != NULL)); @@ -758,6 +783,8 @@ static pascal ComponentResult myComponentRoutineProc ( ComponentParameters * cp, return callOurFunction(myComponentCanDo, uppCallComponentCanDoProcInfo, cp); case kDataHPlaybackHintsSelect: return callOurFunction(componentFunctions_2[0].proc, componentFunctions_2[0].type, cp); + case kDataHPlaybackHints64Select: + return callOurFunction(componentFunctions_2[1].proc, componentFunctions_2[1].type, cp); } if (cp->what > 0 && cp->what <=kDataHGetDataAvailability64Select && componentFunctions[cp->what].proc)

1 0