November 2010 - Wine-Commits

Maarten Lankhorst : quartz: Add IAMFilterMiscFlags to video renderer.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 822c3fe9eab143c0213a0e5a95d9ecdf77c93b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=822c3fe9eab143c0213a0e5a9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:02:24 2010 +0100 quartz: Add IAMFilterMiscFlags to video renderer. --- dlls/quartz/videorenderer.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index c30ce06..3a35f38 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -52,6 +52,7 @@ static const IUnknownVtbl IInner_VTable; static const IBasicVideoVtbl IBasicVideo_VTable; static const IVideoWindowVtbl IVideoWindow_VTable; static const IPinVtbl VideoRenderer_InputPin_Vtbl; +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct VideoRendererImpl { @@ -59,6 +60,7 @@ typedef struct VideoRendererImpl const IBasicVideoVtbl * IBasicVideo_vtbl; const IVideoWindowVtbl * IVideoWindow_vtbl; const IUnknownVtbl * IInner_vtbl; + const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; IUnknown *seekthru_unk; BaseInputPin *pInputPin; @@ -581,6 +583,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pVideoRenderer->bUnkOuterValid = FALSE; pVideoRenderer->bAggregatable = FALSE; pVideoRenderer->IInner_vtbl = &IInner_VTable; + pVideoRenderer->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl; BaseFilter_Init(&pVideoRenderer->filter, &VideoRenderer_Vtbl, &CLSID_VideoRenderer, (DWORD_PTR)(__FILE__ ": VideoRendererImpl.csFilter"), &BaseFuncTable); @@ -666,6 +669,8 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID *ppv = &This->IVideoWindow_vtbl; else if (IsEqualIID(riid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); + else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) + *ppv = &This->IAMFilterMiscFlags_vtbl; if (*ppv) { @@ -2169,3 +2174,33 @@ static const IVideoWindowVtbl IVideoWindow_VTable = Videowindow_HideCursor, Videowindow_IsCursorHidden }; + +static VideoRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { + return (VideoRendererImpl*)((char*)iface - offsetof(VideoRendererImpl, IAMFilterMiscFlags_vtbl)); +} + +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { + VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); +} + +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { + VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { + VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); + return IUnknown_Release((IUnknown*)This); +} + +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { + return AM_FILTER_MISC_FLAGS_IS_RENDERER; +} + +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { + AMFilterMiscFlags_QueryInterface, + AMFilterMiscFlags_AddRef, + AMFilterMiscFlags_Release, + AMFilterMiscFlags_GetMiscFlags +};

1 0

Matteo Bruni : d3dx9: Implement D3DXCreateCubeTexture.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 390ba2c338b21c35608fc41e58ea081535679941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390ba2c338b21c35608fc41e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 18 18:37:14 2010 +0200 d3dx9: Implement D3DXCreateCubeTexture. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8a54382..50bf64d 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -34,7 +34,7 @@ @ stdcall D3DXCreateBox(ptr float float float ptr ptr) @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXCreateCompressedAnimationSet -@ stub D3DXCreateCubeTexture +@ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) @ stub D3DXCreateCubeTextureFromFileA @ stub D3DXCreateCubeTextureFromFileExA @ stub D3DXCreateCubeTextureFromFileExW diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 10af0b3..42d52d7 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -804,3 +804,30 @@ HRESULT WINAPI D3DXCreateTextureFromResourceExW(LPDIRECT3DDEVICE9 device, return D3DXERR_INVALIDDATA; } + +HRESULT WINAPI D3DXCreateCubeTexture(LPDIRECT3DDEVICE9 device, + UINT size, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + LPDIRECT3DCUBETEXTURE9 *texture) +{ + HRESULT hr; + + TRACE("(%p, %u, %u, %#x, %#x, %#x, %p)\n", device, size, miplevels, usage, format, + pool, texture); + + if (!device || !texture) + return D3DERR_INVALIDCALL; + + hr = D3DXCheckCubeTextureRequirements(device, &size, &miplevels, usage, &format, pool); + + if (FAILED(hr)) + { + TRACE("D3DXCheckCubeTextureRequirements failed\n"); + return hr; + } + + return IDirect3DDevice9_CreateCubeTexture(device, size, miplevels, usage, format, pool, texture, NULL); +}

1 0

Alexandre Julliard : ntdll: Explicitly check for failure to map page 0.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 3aa6e3bd899c158f043bda300689829ef3b55b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa6e3bd899c158f043bda300… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 17:47:46 2010 +0100 ntdll: Explicitly check for failure to map page 0. --- dlls/ntdll/virtual.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1674a3e..ea1400e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -993,8 +993,12 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot addr = wine_anon_mmap( (void *)page_size, 0x10000 - page_size, unix_prot, 0 ); if (addr == (void *)page_size) { - addr = NULL; - TRACE( "successfully mapped low 64K range\n" ); + if (!wine_anon_mmap( NULL, page_size, unix_prot, MAP_FIXED )) + { + addr = NULL; + TRACE( "successfully mapped low 64K range\n" ); + } + else TRACE( "failed to map page 0\n" ); } else {

1 0

Alexandre Julliard : kernel32: Fix a trace to print the correct error code.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 332361c1bbc4902ed82e35f77005d3b012509f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332361c1bbc4902ed82e35f77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 16:43:21 2010 +0100 kernel32: Fix a trace to print the correct error code. --- dlls/kernel32/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 19858cf..106b4fb 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -626,7 +626,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, if (serial) *serial = VOLUME_GetSuperblockSerial( &nt_name, type, superblock ); goto fill_fs_info; } - else TRACE( "cannot open device %s: err %d\n", debugstr_w(nt_name.Buffer), GetLastError() ); + else TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status ); /* we couldn't open the device, fallback to default strategy */

1 0

Alexandre Julliard : ntdll: Report memory areas in DOS memory to be free even when not reserved.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 3fa03e1c78f81d78e164b8b4eaf023b5479965ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa03e1c78f81d78e164b8b4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 17:32:42 2010 +0100 ntdll: Report memory areas in DOS memory to be free even when not reserved. --- dlls/ntdll/virtual.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index b97bdd2..1674a3e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -137,6 +137,7 @@ static void *address_space_limit; static void *user_space_limit; static void *working_set_limit; #endif /* __i386__ */ +static void * const address_space_start = (void *)0x110000; #define ROUND_ADDR(addr,mask) \ ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) @@ -726,7 +727,6 @@ struct alloc_area */ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) { - static void * const address_space_start = (void *)0x110000; struct alloc_area *alloc = arg; void *end = (char *)start + size; @@ -2072,7 +2072,7 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) return 0; } - if (info->BaseAddress >= start) + if (info->BaseAddress >= start || start <= address_space_start) { /* it's a real free area */ info->State = MEM_FREE; @@ -2203,17 +2203,22 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, { /* not in a reserved area at all, pretend it's allocated */ #ifdef __i386__ - info->State = MEM_RESERVE; - info->Protect = PAGE_NOACCESS; - info->AllocationProtect = PAGE_NOACCESS; - info->Type = MEM_PRIVATE; -#else - info->State = MEM_FREE; - info->Protect = PAGE_NOACCESS; - info->AllocationBase = 0; - info->AllocationProtect = 0; - info->Type = 0; + if (base >= (char *)address_space_start) + { + info->State = MEM_RESERVE; + info->Protect = PAGE_NOACCESS; + info->AllocationProtect = PAGE_NOACCESS; + info->Type = MEM_PRIVATE; + } + else #endif + { + info->State = MEM_FREE; + info->Protect = PAGE_NOACCESS; + info->AllocationBase = 0; + info->AllocationProtect = 0; + info->Type = 0; + } } } else

1 0

Paul Vriens : msi: Update Serbian (Latin and Cyrillic) translations.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: a3c21e7145d8cf1391bab655650b3a6a150f3a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c21e7145d8cf1391bab6556… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 4 13:24:47 2010 +0100 msi: Update Serbian (Latin and Cyrillic) translations. Translation by Đorđe Vasiljević. --- dlls/msi/msi_Sr.rc | 137 ++++++++++++++++++++++++++-------------------------- 1 files changed, 69 insertions(+), 68 deletions(-) diff --git a/dlls/msi/msi_Sr.rc b/dlls/msi/msi_Sr.rc index ed481ea..123af90 100644 --- a/dlls/msi/msi_Sr.rc +++ b/dlls/msi/msi_Sr.rc @@ -3,6 +3,7 @@ * * Copyright 2010 Nenad Vujic * Paul Vriens + * Copyright 2010 Đorđe Vasiljević * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,80 +28,80 @@ LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN STRINGTABLE { - 4 "Instalacija ne može biti otvorena. Molimo proverite destinaciju fajla i pokušajte ponovo." - 5 "putanja %s nije nađena" + 4 "Instalacioni paket ne može biti otvoren. Proverite putanju datoteke i pokušajte ponovo." + 5 "%s putanja nije pronađena" 9 "Ubacite disk %s" - 10 "Windows Instalacija programa %s\n\n" \ - "Svrha:\n" \ - "msiexec komanda {traženi parametar} [opcioni parametar]\n\n" \ - "Instalacija proizvoda:\n" \ - "\t/i {paket|kod} [svojina]\n" \ - "\t/package {paket|kod} [svojina]\n" \ - "\t/a paket [svojina]\n" \ - "Popravak instalacije:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {paket|kod}\n" \ - "Uninstal programa:\n" \ - "\t/uninstall {paket|kod} [svojina]\n" \ - "\t/x {paket|kod} [svojina]\n" \ - "Reklama programa:\n" \ - "\t/j[u|m] paket [/t pretvori] [/g id jezika]\n" \ - "Primeni peč:\n" \ - "\t/p pečpaket [svojina]\n" \ - "\t/p pečpaket /a paket [svojina]\n" \ - "Izveštalj i Izgled Modifikatori za komande iznad:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] izvestaj\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Registracija MSI Servisa:\n" \ - "\t/y\n " \ - "Uklanjanje MSI Servisa:\n" \ - "\t/z\n" \ - "Prikaži ovu Pomoć:\n" \ - "\t/help\n" \ - "\t/?\n" - 11 "unesite koji folder sadrži %s" - 12 "instalacija nedostaje" - 13 "mrežni drajv nedostaje" - 14 "dodatak sa:" - 15 "izaberite koji folder sadrži %s" + 10 "Windows instalacija programa %s\n\n" \ + "Upotreba:\n" \ + "msiexec naredba {obavezan parametar} [neobavezan parametar]\n\n" \ + "Instalacija proizvoda:\n" \ + "\t/i {paket|kôd} [svojina]\n" \ + "\t/package {paket|kôd} [svojina]\n" \ + "\t/a paket [svojina]\n" \ + "Popravka instalacije:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {paket|kôd}\n" \ + "Uklanjanje proizvoda:\n" \ + "\t/deinstalacija {paket|kôd} [svojina]\n" \ + "\t/x {paket|kôd} [svojina]\n" \ + "Reklama proizvoda:\n" \ + "\t/j[u|m] paket [/t pretvori] [/g ID jezika]\n" \ + "Primena zakrpe:\n" \ + "\t/p zakrpa [svojina]\n" \ + "\t/p zakrpa/paket [svojina]\n" \ + "Izveštaj i izgled izmenjivača za naredbe iznad:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] izveštaj\n" \ + "\t/q{|n|b|r|f|n+|b+|b-}\n" \ + "Registracija MSI usluge:\n" \ + "\t/y\n" \ + "Odjava MSI usluge:\n" \ + "\t/z\n" \ + "Prikaži pomoć:\n" \ + "\t/pomoć\n" \ + "\t/?\n" + 11 "unesite koja fascikla sadrži %s" + 12 "nedostaje instalacija" + 13 "nedostaje mrežna jedinica" + 14 "mogućnost od:" + 15 "izaberite koja fascikla sadrži %s" } LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC STRINGTABLE { - 4 "Инсталација не може бити отворена. Молимо проверите дестинацију фајла и покушајте поново." - 5 "путања %s није нађена" + 4 "Инсталациони пакет не може бити отворен. Проверите путању датотеке и покушајте поново." + 5 "%s путања није пронађена" 9 "Убаците диск %s" - 10 "Виндовс Инсталација програма %s\n\n" \ - "Сврха:\n" \ - "msiexec команда {тражени параметар} [опциони параметар]\n\n" \ - "Инсталација производа:\n" \ - "\t/i {пакет|код} [својина]\n" \ - "\t/package {пакет|код} [својина]\n" \ - "\t/a пакет [svojina]\n" \ - "Поправак инсталације:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {пакет|код}\n" \ - "Брисање програма:\n" \ - "\t/uninstall {пакет|код} [svojina]\n" \ - "\t/x {пакет|код} [својина]\n" \ - "Реклама програма:\n" \ - "\t/j[u|m] пакет [/t transform] [/g languageid]\n" \ - "Примени печ:\n" \ - "\t/p печпакет [својина]\n" \ - "\t/p печпакет /a пакет [својина]\n" \ - "Известај и Изглед Модификатора за команде изнад:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] извештај\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Регистрација МСИ Сервиса:\n" \ - "\t/y\n" \ - "Уклањање МСИ Сервиса:\n" \ - "\t/z\n" \ - "Прикажи ову Помоћ:\n" \ - "\t/help\n" \ - "\t/?\n" - 11 "Унесите који фолдер садржи %s" - 12 "Инсталација недостаје" - 13 "Мрежни драјв недостаје" - 14 "Додатак са:" - 15 "Изаберите који фолдер садржи %s" + 10 "Windows инсталација програма %s\n\n" \ + "Употреба:\n" \ + "msiexec наредба {обавезан параметар} [необавезан параметар]\n\n" \ + "Инсталација производа:\n" \ + "\t/i {пакет|кôд} [својина]\n" \ + "\t/package {пакет|кôд} [својина]\n" \ + "\t/a пакет [својина]\n" \ + "Поправка инсталације:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {пакет|кôд}\n" \ + "Уклањање производа:\n" \ + "\t/деинсталација {пакет|кôд} [својина]\n" \ + "\t/x {пакет|кôд} [својина]\n" \ + "Реклама производа:\n" \ + "\t/j[u|m] пакет [/t претвори] [/g ID језика]\n" \ + "Примена закрпе:\n" \ + "\t/p закрпа [својина]\n" \ + "\t/p закрпа/пакет [својина]\n" \ + "Извештај и изглед измењивача за наредбе изнад:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] извештај\n" \ + "\t/q{|n|b|r|f|n+|b+|b-}\n" \ + "Регистрација MSI услуге:\n" \ + "\t/y\n" \ + "Одјава MSI услуге:\n" \ + "\t/z\n" \ + "Прикажи помоћ:\n" \ + "\t/помоћ\n" \ + "\t/?\n" + 11 "унесите која фасцикла садржи %s" + 12 "недостаје инсталација" + 13 "недостаје мрежна јединица" + 14 "могућност од:" + 15 "изаберите која фасцикла садржи %s" }

1 0

Matteo Bruni : d3dx9: Implement D3DXFilterTexture for cube textures.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: a875f3830108c773ec73abf134ef12d54fe2870f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a875f3830108c773ec73abf13… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 13 01:30:34 2010 +0200 d3dx9: Implement D3DXFilterTexture for cube textures. --- dlls/d3dx9_36/tests/texture.c | 22 +++++++++++++- dlls/d3dx9_36/texture.c | 65 +++++++++++++++++++++++++++++++--------- 2 files changed, 71 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 6f6c43d..9856800 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -3,6 +3,7 @@ * * Copyright 2009 Tony Wasserka * Copyright 2010 Owen Rudge for CodeWeavers + * Copyright 2010 Matteo Bruni for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -398,6 +399,7 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) static void test_D3DXFilterTexture(IDirect3DDevice9 *device) { IDirect3DTexture9 *tex; + IDirect3DCubeTexture9 *cubetex; HRESULT hr; hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 5, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex, NULL); @@ -433,7 +435,6 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) else skip("Failed to create texture\n"); - hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &tex, NULL); if (SUCCEEDED(hr)) @@ -444,6 +445,25 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) } else skip("Failed to create texture\n"); + + /* Cube texture test */ + hr = IDirect3DDevice9_CreateCubeTexture(device, 256, 5, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &cubetex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) cubetex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) cubetex, NULL, 0, D3DX_FILTER_BOX + 1); /* Invalid filter */ + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) cubetex, NULL, 5, D3DX_FILTER_NONE); /* Invalid miplevel */ + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + } + else + skip("Failed to create texture\n"); + + IDirect3DCubeTexture9_Release(cubetex); } START_TEST(texture) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2ae818f..5afceb4 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -2,6 +2,7 @@ * Copyright 2009 Tony Wasserka * Copyright 2010 Christian Costa * Copyright 2010 Owen Rudge for CodeWeavers + * Copyright 2010 Matteo Bruni for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -45,6 +46,21 @@ static UINT make_pow2(UINT num) return result; } +static HRESULT get_surface(D3DRESOURCETYPE type, LPDIRECT3DBASETEXTURE9 tex, + int face, UINT level, LPDIRECT3DSURFACE9 *surf) +{ + switch (type) + { + case D3DRTYPE_TEXTURE: + return IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) tex, level, surf); + case D3DRTYPE_CUBETEXTURE: + return IDirect3DCubeTexture9_GetCubeMapSurface((IDirect3DCubeTexture9*) tex, face, level, surf); + default: + ERR("Unexpected texture type\n"); + return E_NOTIMPL; + } +} + HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, CONST PALETTEENTRY *palette, UINT srclevel, @@ -52,6 +68,7 @@ HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, { UINT level = srclevel + 1; HRESULT hr; + D3DRESOURCETYPE type; TRACE("(%p, %p, %d, %d)\n", texture, palette, srclevel, filter); @@ -64,46 +81,64 @@ HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, if (srclevel >= IDirect3DBaseTexture9_GetLevelCount(texture)) return D3DERR_INVALIDCALL; - switch (IDirect3DBaseTexture9_GetType(texture)) + switch (type = IDirect3DBaseTexture9_GetType(texture)) { case D3DRTYPE_TEXTURE: + case D3DRTYPE_CUBETEXTURE: { IDirect3DSurface9 *topsurf, *mipsurf; D3DSURFACE_DESC desc; + int i, numfaces; - if (filter == D3DX_DEFAULT) + if (type == D3DRTYPE_TEXTURE) { + numfaces = 1; IDirect3DTexture9_GetLevelDesc((IDirect3DTexture9*) texture, srclevel, &desc); + } + else + { + numfaces = 6; + IDirect3DCubeTexture9_GetLevelDesc((IDirect3DTexture9*) texture, srclevel, &desc); + } + if (filter == D3DX_DEFAULT) + { if (is_pow2(desc.Width) && is_pow2(desc.Height)) filter = D3DX_FILTER_BOX; else filter = D3DX_FILTER_BOX | D3DX_FILTER_DITHER; } - hr = IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) texture, srclevel, &topsurf); - - if (FAILED(hr)) - return D3DERR_INVALIDCALL; - - while (IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) texture, level, &mipsurf) == D3D_OK) + for (i = 0; i < numfaces; i++) { - hr = D3DXLoadSurfaceFromSurface(mipsurf, palette, NULL, topsurf, palette, NULL, filter, 0); - IDirect3DSurface9_Release(mipsurf); + level = srclevel + 1; + hr = get_surface(type, texture, i, srclevel, &topsurf); if (FAILED(hr)) - break; + return D3DERR_INVALIDCALL; - level++; - } + while (get_surface(type, texture, i, level, &mipsurf) == D3D_OK) + { + hr = D3DXLoadSurfaceFromSurface(mipsurf, palette, NULL, topsurf, palette, NULL, filter, 0); + IDirect3DSurface9_Release(topsurf); + topsurf = mipsurf; + + if (FAILED(hr)) + break; + + level++; + } - IDirect3DSurface9_Release(topsurf); + IDirect3DSurface9_Release(topsurf); + if (FAILED(hr)) + return hr; + } return D3D_OK; } default: - FIXME("Implement volume and cube texture filtering\n"); + FIXME("Implement volume texture filtering\n"); return E_NOTIMPL; } }

1 0

Jacek Caban : urlmon: Compute expected Uri_HAS_* flags from property arrays .
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 68272bac314675ac80d299825538d366fcb7eb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68272bac314675ac80d299825… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 4 13:01:42 2010 +0100 urlmon: Compute expected Uri_HAS_* flags from property arrays. --- dlls/urlmon/tests/uri.c | 621 +++-------------------------------------------- 1 files changed, 32 insertions(+), 589 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68272bac314675ac80d29…

1 0

Jacek Caban : mshtml: Properly handle QueryService(SID_SOleUndoManager) call.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 99773fca4693c69781e05c066e0cb0dc0500740b URL: http://source.winehq.org/git/wine.git/?a=commit;h=99773fca4693c69781e05c066… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 4 13:08:10 2010 +0100 mshtml: Properly handle QueryService(SID_SOleUndoManager) call. --- dlls/mshtml/service.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index c77afe4..ef5a9d1 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -237,15 +237,13 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return E_NOINTERFACE; } - if(IsEqualGUID(&IID_IOleUndoManager, riid)) { - TRACE("(%p)->(IID_IOleUndoManager %p)\n", This, ppv); + if(IsEqualGUID(&SID_SOleUndoManager, guidService)) { + TRACE("SID_SOleUndoManager\n"); if(!This->doc_obj->undomgr) This->doc_obj->undomgr = create_undomgr(); - IOleUndoManager_AddRef(This->doc_obj->undomgr); - *ppv = This->doc_obj->undomgr; - return S_OK; + return IOleUndoManager_QueryInterface(This->doc_obj->undomgr, riid, ppv); } if(This->doc_obj->client) {

1 0

Matteo Bruni : d3dx9: Implement D3DXCheckCubeTextureRequirements.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 6933766531137e2bf1a78af876e1c2969e0317fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6933766531137e2bf1a78af87… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 18 17:05:29 2010 +0200 d3dx9: Implement D3DXCheckCubeTextureRequirements. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/tests/texture.c | 87 ++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/texture.c | 40 +++++++++++++++++++ 3 files changed, 123 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 7f974d1..8a54382 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -4,7 +4,7 @@ @ stdcall D3DXAssembleShaderFromResourceA(long str ptr ptr long ptr ptr) @ stdcall D3DXAssembleShaderFromResourceW(long wstr ptr ptr long ptr ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) -@ stub D3DXCheckCubeTextureRequirements +@ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr ptr) @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr ptr) @ stdcall D3DXCheckVersion(long long) @ stub D3DXCheckVolumeTextureRequirements diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 9856800..2d020fd 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -92,11 +92,6 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(width == 1, "Returned width %d, expected %d\n", width, 1); - width = D3DX_DEFAULT; - hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == 256, "Returned width %d, expected %d\n", width, 256); - width = 0xFFFFFFFE; hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); @@ -196,6 +191,87 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) IDirect3D9_Release(d3d); } +static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) +{ + UINT size, mipmaps; + D3DFORMAT format; + D3DCAPS9 caps; + HRESULT hr; + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + + /* general tests */ + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckCubeTextureRequirements(NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* size */ + size = D3DX_DEFAULT; + hr = D3DXCheckCubeTextureRequirements(device, &size, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(size == 256, "Returned size %d, expected %d\n", size, 256); + + /* mipmaps */ + size = 64; + mipmaps = 9; + hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 7, "Returned mipmaps %d, expected %d\n", mipmaps, 7); + + size = 284; + mipmaps = 20; + hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 10, "Returned mipmaps %d, expected %d\n", mipmaps, 10); + + size = 63; + mipmaps = 9; + hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 7, "Returned mipmaps %d, expected %d\n", mipmaps, 7); + + mipmaps = 0; + hr = D3DXCheckCubeTextureRequirements(device, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + + /* usage */ + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, D3DUSAGE_WRITEONLY, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckCubeTextureRequirements succeeded, but should've failed.\n"); + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, D3DUSAGE_DONOTCLIP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckCubeTextureRequirements succeeded, but should've failed.\n"); + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, D3DUSAGE_POINTS, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckCubeTextureRequirements succeeded, but should've failed.\n"); + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, D3DUSAGE_RTPATCHES, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckCubeTextureRequirements succeeded, but should've failed.\n"); + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, D3DUSAGE_NPATCHES, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckCubeTextureRequirements succeeded, but should've failed.\n"); + + /* format */ + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + format = D3DFMT_UNKNOWN; + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); + + format = D3DX_DEFAULT; + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); + + format = D3DFMT_R8G8B8; + hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_X8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_X8R8G8B8); +} + static void test_D3DXCreateTexture(IDirect3DDevice9 *device) { IDirect3DTexture9 *texture; @@ -498,6 +574,7 @@ START_TEST(texture) } test_D3DXCheckTextureRequirements(device); + test_D3DXCheckCubeTextureRequirements(device); test_D3DXCreateTexture(device); test_D3DXFilterTexture(device); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 5afceb4..10af0b3 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -343,6 +343,46 @@ cleanup: return D3D_OK; } +HRESULT WINAPI D3DXCheckCubeTextureRequirements(LPDIRECT3DDEVICE9 device, + UINT *size, + UINT *miplevels, + DWORD usage, + D3DFORMAT *format, + D3DPOOL pool) +{ + D3DCAPS9 caps; + UINT s = (size && *size) ? *size : 256; + HRESULT hr; + + TRACE("(%p, %p, %p, %u, %p, %u)\n", device, size, miplevels, usage, format, pool); + + if (s == D3DX_DEFAULT) + s = 256; + + if (!device || FAILED(IDirect3DDevice9_GetDeviceCaps(device, &caps))) + return D3DERR_INVALIDCALL; + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + return D3DERR_NOTAVAILABLE; + + /* ensure width/height is power of 2 */ + if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s))) + s = make_pow2(s); + + hr = D3DXCheckTextureRequirements(device, &s, &s, miplevels, usage, format, pool); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP)) + { + if(miplevels) + *miplevels = 1; + } + + if (size) + *size = s; + + return hr; +} + HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, UINT width, UINT height,

1 0