August 2009 - Wine-commits - list.winehq.org

Ge van Geldorp : comdlg32/tests: Fix test on Win7.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 5d38ddc208854db6981635c6aaeb66160ea5940d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d38ddc208854db6981635c6a… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 31 09:15:35 2009 +0200 comdlg32/tests: Fix test on Win7. --- dlls/comdlg32/tests/filedlg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index ade7f8d..be3cf8c 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -634,9 +634,11 @@ static void test_ok(void) OPENFILENAME ofn = { sizeof(OPENFILENAME)}; char filename[1024] = {0}; char tmpfilename[ MAX_PATH]; + char curdir[MAX_PATH]; int i; DWORD ret; + ok(GetCurrentDirectoryA(sizeof(curdir), curdir) != 0, "Failed to get current dir err %d\n", GetLastError()); if (!GetTempFileNameA(".", "txt", 0, tmpfilename)) { skip("Failed to create a temporary file name\n"); return; @@ -659,6 +661,7 @@ static void test_ok(void) ok(ret == ok_testcases[i].expclose, "testid %d: GetOpenFileName returned %#x\n", i, ret); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + ok(SetCurrentDirectoryA(curdir), "Failed to restore current dir err %d\n", GetLastError()); } ret = DeleteFileA( tmpfilename); ok( ret, "Failed to delete temporary file %s err %d\n", tmpfilename, GetLastError());

1 0

Ge van Geldorp : comctl32/tests: Adjust message sequences for Win7 (updown) .
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: ae516dbac93c3558ffc90e76e29d7e2bc947ac12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae516dbac93c3558ffc90e76e… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 31 09:14:52 2009 +0200 comctl32/tests: Adjust message sequences for Win7 (updown). --- dlls/comctl32/tests/updown.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index f2b3cc2..40c9607 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -73,7 +73,7 @@ static const struct message create_parent_wnd_seq[] = { { WM_QUERYNEWPALETTE, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|defwinproc|optional },

1 0

Ge van Geldorp : comctl32/tests: Adjust message sequences for Win7 ( monthcal).
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: bc76560b56c7a4ed176f71a32fb9af73a7de8af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc76560b56c7a4ed176f71a32… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Aug 31 09:13:53 2009 +0200 comctl32/tests: Adjust message sequences for Win7 (monthcal). --- dlls/comctl32/tests/monthcal.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 1ca1997..5f8e09e 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -56,7 +56,7 @@ static const struct message create_parent_window_seq[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, 0 }, { WM_WINDOWPOSCHANGED, sent|optional }, { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|defwinproc|optional }, @@ -299,12 +299,14 @@ static const struct message destroy_parent_seq[] = { { 0x0090, sent|optional }, /* Vista */ { WM_WINDOWPOSCHANGING, sent|wparam, 0}, { WM_WINDOWPOSCHANGED, sent|wparam, 0}, - { WM_NCACTIVATE, sent|wparam, 0}, - { WM_ACTIVATE, sent|wparam, 0}, + { WM_IME_SETCONTEXT, sent|wparam|optional, 0}, + { WM_IME_NOTIFY, sent|wparam|lparam|defwinproc|optional, 1, 0}, + { WM_NCACTIVATE, sent|wparam|optional, 0}, + { WM_ACTIVATE, sent|wparam|optional, 0}, { WM_NCACTIVATE, sent|wparam|lparam|optional, 0, 0}, { WM_ACTIVATE, sent|wparam|lparam|optional, 0, 0}, - { WM_ACTIVATEAPP, sent|wparam, 0}, - { WM_KILLFOCUS, sent|wparam|lparam, 0, 0}, + { WM_ACTIVATEAPP, sent|wparam|optional, 0}, + { WM_KILLFOCUS, sent|wparam|lparam|optional, 0, 0}, { WM_IME_SETCONTEXT, sent|wparam|optional, 0}, { WM_IME_NOTIFY, sent|wparam|lparam|defwinproc|optional, 1, 0}, { WM_DESTROY, sent|wparam|lparam, 0, 0},

1 0

Andrew Nguyen : comdlg32: Fix the copyright year for the Esperanto translation.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: a1fb872e766a71772cdcfba407df48000f164714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1fb872e766a71772cdcfba40… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Aug 30 23:33:49 2009 -0500 comdlg32: Fix the copyright year for the Esperanto translation. --- dlls/comdlg32/cdlg_Eo.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Eo.rc b/dlls/comdlg32/cdlg_Eo.rc index c6471be..cf4ad4c 100644 --- a/dlls/comdlg32/cdlg_Eo.rc +++ b/dlls/comdlg32/cdlg_Eo.rc @@ -1,6 +1,6 @@ /* * Copyright 1996 Duncan C Thomson - * Copyright 1006 Antonio Codazzi + * Copyright 2006 Antonio Codazzi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Jacek Caban : mshtml: Fixed script tests on IE8.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: ccc5a575d2620336920c2cc48846d6a1e19b3051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc5a575d2620336920c2cc48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 31 02:15:09 2009 +0200 mshtml: Fixed script tests on IE8. --- dlls/mshtml/script.c | 46 +++++++++++++++++++++++++++++-------------- dlls/mshtml/tests/script.c | 44 ++++++++++++++++++++++++++++++++++------- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 55636d2..e12588c 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -67,12 +67,30 @@ typedef struct { #define ACTSCPWIN(x) (&(x)->lpIActiveScriptSiteWindowVtbl) #define ACTSCPDBG32(x) (&(x)->lpIActiveScriptSiteDebug32Vtbl) +static void set_script_prop(ScriptHost *script_host, DWORD property, VARIANT *val) +{ + IActiveScriptProperty *script_prop; + HRESULT hres; + + hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptProperty, + (void**)&script_prop); + if(FAILED(hres)) { + WARN("Could not get IActiveScriptProperty iface: %08x\n", hres); + return; + } + + hres = IActiveScriptProperty_SetProperty(script_prop, property, NULL, val); + IActiveScriptProperty_Release(script_prop); + if(FAILED(hres)) + WARN("SetProperty(%x) failed: %08x\n", property, hres); +} + static BOOL init_script_engine(ScriptHost *script_host) { - IActiveScriptProperty *property; IObjectSafety *safety; SCRIPTSTATE state; DWORD supported_opts=0, enabled_opts=0; + VARIANT var; HRESULT hres; hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParse, (void**)&script_host->parse); @@ -104,20 +122,13 @@ static BOOL init_script_engine(ScriptHost *script_host) if(FAILED(hres)) return FALSE; - hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptProperty, (void**)&property); - if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_BOOL; - V_BOOL(&var) = VARIANT_TRUE; - hres = IActiveScriptProperty_SetProperty(property, SCRIPTPROP_HACK_TRIDENTEVENTSINK, NULL, &var); - if(FAILED(hres)) - WARN("SetProperty failed: %08x\n", hres); + V_VT(&var) = VT_I4; + V_I4(&var) = 1; + set_script_prop(script_host, SCRIPTPROP_INVOKEVERSIONING, &var); - IActiveScriptProperty_Release(property); - }else { - WARN("Could not get IActiveScriptProperty: %08x\n", hres); - } + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = VARIANT_TRUE; + set_script_prop(script_host, SCRIPTPROP_HACK_TRIDENTEVENTSINK, &var); hres = IActiveScriptParse64_InitNew(script_host->parse); if(FAILED(hres)) { @@ -146,8 +157,13 @@ static BOOL init_script_engine(ScriptHost *script_host) hres = IActiveScript_AddNamedItem(script_host->script, windowW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); - if(FAILED(hres)) + if(SUCCEEDED(hres)) { + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = VARIANT_TRUE; + set_script_prop(script_host, SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION, &var); + }else { WARN("AddNamedItem failed: %08x\n", hres); + } hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParseProcedure2, (void**)&script_host->parse_proc); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index f183604..157b00f 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -74,6 +74,12 @@ DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00 expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + #define CHECK_NOT_CALLED(func) \ do { \ ok(!called_ ## func, "unexpected " #func "\n"); \ @@ -89,7 +95,9 @@ DEFINE_EXPECT(GetInterfaceSafetyOptions); DEFINE_EXPECT(SetInterfaceSafetyOptions); DEFINE_EXPECT(InitNew); DEFINE_EXPECT(Close); -DEFINE_EXPECT(SetProperty); +DEFINE_EXPECT(SetProperty_HACK_TRIDENTEVENTSINK); +DEFINE_EXPECT(SetProperty_INVOKEVERSIONING); +DEFINE_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(GetScriptState); DEFINE_EXPECT(SetScriptState_STARTED); @@ -504,15 +512,31 @@ static HRESULT WINAPI ActiveScriptProperty_GetProperty(IActiveScriptProperty *if static HRESULT WINAPI ActiveScriptProperty_SetProperty(IActiveScriptProperty *iface, DWORD dwProperty, VARIANT *pvarIndex, VARIANT *pvarValue) { - CHECK_EXPECT(SetProperty); + switch(dwProperty) { + case SCRIPTPROP_HACK_TRIDENTEVENTSINK: + CHECK_EXPECT(SetProperty_HACK_TRIDENTEVENTSINK); + ok(V_VT(pvarValue) == VT_BOOL, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); + ok(V_BOOL(pvarValue) == VARIANT_TRUE, "V_BOOL(pvarValue)=%x\n", V_BOOL(pvarValue)); + break; + case SCRIPTPROP_INVOKEVERSIONING: + CHECK_EXPECT(SetProperty_INVOKEVERSIONING); + ok(V_VT(pvarValue) == VT_I4, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); + ok(V_I4(pvarValue) == 1, "V_I4(pvarValue)=%d\n", V_I4(pvarValue)); + break; + case SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION: + CHECK_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); + ok(V_VT(pvarValue) == VT_BOOL, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); + ok(V_BOOL(pvarValue) == VARIANT_TRUE, "V_BOOL(pvarValue)=%x\n", V_BOOL(pvarValue)); + break; + default: + ok(0, "unexpected property %x\n", dwProperty); + return E_NOTIMPL; + } - ok(dwProperty == SCRIPTPROP_HACK_TRIDENTEVENTSINK, "unexpected property %d\n", dwProperty); ok(!pvarIndex, "pvarIndex != NULL\n"); ok(pvarValue != NULL, "pvarValue == NULL\n"); - ok(V_VT(pvarValue) == VT_BOOL, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); - ok(V_BOOL(pvarValue) == VARIANT_TRUE, "V_BOOL(pvarValue)=%x\n", V_BOOL(pvarValue)); - return E_NOTIMPL; + return S_OK; } static const IActiveScriptPropertyVtbl ActiveScriptPropertyVtbl = { @@ -1028,12 +1052,14 @@ static void test_simple_script(void) SET_EXPECT(CreateInstance); SET_EXPECT(GetInterfaceSafetyOptions); SET_EXPECT(SetInterfaceSafetyOptions); - SET_EXPECT(SetProperty); + SET_EXPECT(SetProperty_INVOKEVERSIONING); /* IE8 */ + SET_EXPECT(SetProperty_HACK_TRIDENTEVENTSINK); SET_EXPECT(InitNew); SET_EXPECT(SetScriptSite); SET_EXPECT(GetScriptState); SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(AddNamedItem); + SET_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); /* IE8 */ SET_EXPECT(ParseScriptText); SET_EXPECT(SetScriptState_CONNECTED); @@ -1043,12 +1069,14 @@ static void test_simple_script(void) CHECK_CALLED(CreateInstance); CHECK_CALLED(GetInterfaceSafetyOptions); CHECK_CALLED(SetInterfaceSafetyOptions); - CHECK_CALLED(SetProperty); + CHECK_CALLED_BROKEN(SetProperty_INVOKEVERSIONING); /* IE8 */ + CHECK_CALLED(SetProperty_HACK_TRIDENTEVENTSINK); CHECK_CALLED(InitNew); CHECK_CALLED(SetScriptSite); CHECK_CALLED(GetScriptState); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(AddNamedItem); + CHECK_CALLED_BROKEN(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); /* IE8 */ CHECK_CALLED(ParseScriptText); CHECK_CALLED(SetScriptState_CONNECTED);

1 0

Austin English : winscard: Add a stub for SCardListCardsA.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 13b6a43d736cb3052d8c890e3986aa72ef356700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b6a43d736cb3052d8c890e3… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Aug 30 18:59:16 2009 -0500 winscard: Add a stub for SCardListCardsA. --- dlls/winscard/winscard.c | 7 +++++++ dlls/winscard/winscard.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index f390b70..b9d5d46 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -94,3 +94,10 @@ LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } + +LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguidInterfaces, DWORD cguidInterfaceCount, LPSTR mszCards, LPDWORD pcchCards) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 44d43ab..67c0d9f 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -34,7 +34,7 @@ @ stub SCardIntroduceReaderGroupW @ stub SCardIntroduceReaderW @ stub SCardIsValidContext -@ stub SCardListCardsA +@ stdcall SCardListCardsA(long ptr ptr long str long) @ stub SCardListCardsW @ stub SCardListInterfacesA @ stub SCardListInterfacesW

1 0

Austin English : ntdll/tests: Fix a compiler warning on PowerPC.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: e88e2239aac0f7e389f805d7dd4be6bb17b0fc1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e88e2239aac0f7e389f805d7d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Aug 30 15:05:49 2009 -0500 ntdll/tests: Fix a compiler warning on PowerPC. --- dlls/ntdll/tests/rtlbitmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index fc7f6c5..d24f0af 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -413,7 +413,7 @@ static void test_RtlFindClearBitsAndSet(void) static void test_RtlFindMostSignificantBit(void) { int i; - CCHAR cPos; + signed char cPos; ULONGLONG ulLong; if (!pRtlFindMostSignificantBit) @@ -442,7 +442,7 @@ static void test_RtlFindMostSignificantBit(void) static void test_RtlFindLeastSignificantBit(void) { int i; - CCHAR cPos; + signed char cPos; ULONGLONG ulLong; if (!pRtlFindLeastSignificantBit)

1 0

Stefan Dösinger : wined3d: SetLOD is ignored on D3DPOOL_DEFAULT textures.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: 9281bdb478ba5d2c40dd3baaf28b6d7aef292c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9281bdb478ba5d2c40dd3baaf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 30 22:02:51 2009 +0200 wined3d: SetLOD is ignored on D3DPOOL_DEFAULT textures. I am not testing SYSTEMMEM and SCRATCH textures. SCRATCH textures cannot be created, SYSTEMMEM ones cannot be used for texturing on Windows. --- dlls/d3d9/tests/texture.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/basetexture.c | 10 +++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 2623b13..cc97e75 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -352,6 +352,31 @@ static void test_gettexture(IDirect3DDevice9 *device) { ok(texture == NULL, "Texture returned is %p, expected NULL\n", texture); } +static void test_lod(IDirect3DDevice9 *device) +{ + HRESULT hr; + DWORD ret; + IDirect3DTexture9 *texture; + + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 3, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, + &texture, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %08x\n", hr); + + /* SetLOD is only supported on D3DPOOL_MANAGED textures, but it doesn't return a HRESULT, + * so it can't return a normal error. Instead, the call is simply ignored + */ + ret = IDirect3DTexture9_SetLOD(texture, 0); + ok(ret == 0, "IDirect3DTexture9_SetLOD returned %u, expected 0\n", ret); + ret = IDirect3DTexture9_SetLOD(texture, 1); + ok(ret == 0, "IDirect3DTexture9_SetLOD returned %u, expected 0\n", ret); + ret = IDirect3DTexture9_SetLOD(texture, 2); + ok(ret == 0, "IDirect3DTexture9_SetLOD returned %u, expected 0\n", ret); + ret = IDirect3DTexture9_GetLOD(texture); + ok(ret == 0, "IDirect3DTexture9_GetLOD returned %u, expected 0\n", ret); + + IDirect3DTexture9_Release(texture); +} + START_TEST(texture) { D3DCAPS9 caps; @@ -376,6 +401,7 @@ START_TEST(texture) test_mipmap_gen(device_ptr); test_filter(device_ptr); test_gettexture(device_ptr); + test_lod(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount); diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 2bfbcc7..ab38b62 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -97,8 +97,12 @@ DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD LODNew) IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; DWORD old = This->baseTexture.LOD; + /* The d3d9:texture test shows that SetLOD is ignored on non-managed + * textures. The call always returns 0, and GetLOD always returns 0 + */ if (This->resource.pool != WINED3DPOOL_MANAGED) { - return WINED3DERR_INVALIDCALL; + TRACE("Ignoring SetLOD on %s texture, returning 0\n", debug_d3dpool(This->resource.pool)); + return 0; } if(LODNew >= This->baseTexture.levels) @@ -123,10 +127,6 @@ DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - if (This->resource.pool != WINED3DPOOL_MANAGED) { - return WINED3DERR_INVALIDCALL; - } - TRACE("(%p) : returning %d\n", This, This->baseTexture.LOD); return This->baseTexture.LOD;

1 0

Stefan Dösinger : wined3d: Handle per-texture max LOD level.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: edf1c50b5419459f6fce604080328ca783b92ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf1c50b5419459f6fce60408… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 30 22:02:17 2009 +0200 wined3d: Handle per-texture max LOD level. GL_TEXTURE_BASE_LEVEL matches the basetexture::SetLOD functionality. D3DSAMP_MAXMIPLEVEL essentially does the same as SetLOD. The test included in this patch shows that the smallest mipmap level is used. --- dlls/d3d9/tests/visual.c | 66 ++++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/basetexture.c | 23 +++++++++++---- 2 files changed, 78 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 48fea06..0fb7899 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2820,11 +2820,6 @@ static void maxmip_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); } - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); /* Max Mip level 0-2 sample from the specified texture level, Max Mip level 3(> levels in texture) @@ -2839,8 +2834,69 @@ static void maxmip_test(IDirect3DDevice9 *device) color = getPixelColor(device, 480, 360); ok(color == 0x0000FF00, "MapMip 1, point mipfilter has color %08x\n", color); + hr = IDirect3DDevice9_BeginScene(device); + if(SUCCEEDED(hr)) + { + DWORD ret; + + /* Mipmapping OFF, LOD level smaller than MAXMIPLEVEL. LOD level limits */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + ret = IDirect3DTexture9_SetLOD(texture, 1); + ok(ret == 0, "IDirect3DTexture9_SetLOD returned %u, expected 0\n", ret); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[ 0], 5 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + + /* Mipmapping ON, LOD level smaller than max mip level. LOD level limits */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + ret = IDirect3DTexture9_SetLOD(texture, 2); + ok(ret == 1, "IDirect3DTexture9_SetLOD returned %u, expected 1\n", ret); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[20], 5 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + + /* Mipmapping ON, LOD level bigger than max mip level. MAXMIPLEVEL limits */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 2); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + ret = IDirect3DTexture9_SetLOD(texture, 1); + ok(ret == 2, "IDirect3DTexture9_SetLOD returned %u, expected 2\n", ret); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[40], 5 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + + /* Mipmapping OFF, LOD level bigger than max mip level. LOD level limits */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 2); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + ret = IDirect3DTexture9_SetLOD(texture, 1); + ok(ret == 1, "IDirect3DTexture9_SetLOD returned %u, expected 1\n", ret); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[60], 5 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + /* Max Mip level 0-2 sample from the specified texture level, Max Mip level 3(> levels in texture) + * samples from the highest level in the texture(level 2) + */ + color = getPixelColor(device, 160, 360); + ok(color == 0x0000FF00, "MaxMip 0, LOD 1, none mipfilter has color 0x%08x\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x0000FF00, "MaxMip 1, LOD 2, point mipfilter has color 0x%08x\n", color); + color = getPixelColor(device, 480, 120); + ok(color == 0x000000FF, "MapMip 2, LOD 1, point mipfilter has color 0x%08x\n", color); + color = getPixelColor(device, 480, 360); + ok(color == 0x000000FF, "MapMip 2, LOD 1, none mipfilter has color 0x%08x\n", color); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 0); ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); IDirect3DTexture9_Release(texture); diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index a36d993..2bfbcc7 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -92,11 +92,10 @@ void basetexture_unload(IWineD3DBaseTexture *iface) This->baseTexture.srgbDirty = TRUE; } -/* There is no OpenGL equivalent of setLOD, getLOD. All they do anyway is prioritize texture loading - * so just pretend that they work unless something really needs a failure. */ DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD LODNew) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; + DWORD old = This->baseTexture.LOD; if (This->resource.pool != WINED3DPOOL_MANAGED) { return WINED3DERR_INVALIDCALL; @@ -104,11 +103,20 @@ DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD LODNew) if(LODNew >= This->baseTexture.levels) LODNew = This->baseTexture.levels - 1; - This->baseTexture.LOD = LODNew; - TRACE("(%p) : set bogus LOD to %d\n", This, This->baseTexture.LOD); + if(This->baseTexture.LOD != LODNew) { + This->baseTexture.LOD = LODNew; - return This->baseTexture.LOD; + This->baseTexture.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; + This->baseTexture.srgbstates[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; + if(This->baseTexture.bindCount) { + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(This->baseTexture.sampler)); + } + } + + TRACE("(%p) : set LOD to %d\n", This, This->baseTexture.LOD); + + return old; } DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) @@ -426,9 +434,12 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, if(!cond_np2) { if(states[WINED3DTEXSTA_MIPFILTER] == WINED3DTEXF_NONE) { - glValue = 0; + glValue = This->baseTexture.LOD; } else if(states[WINED3DTEXSTA_MAXMIPLEVEL] >= This->baseTexture.levels) { glValue = This->baseTexture.levels - 1; + } else if(states[WINED3DTEXSTA_MAXMIPLEVEL] < This->baseTexture.LOD) { + /* baseTexture.LOD is already clamped in the setter */ + glValue = This->baseTexture.LOD; } else { glValue = states[WINED3DTEXSTA_MAXMIPLEVEL]; }

1 0

Stefan Dösinger : wined3d: Add a comment about D3DSAMP_MAXMIPLEVEL.
by Alexandre Julliard 31 Aug '09

31 Aug '09

Module: wine Branch: master Commit: eafc00e1731757010e8ec39a82093eddd34ed1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafc00e1731757010e8ec39a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 30 17:46:38 2009 +0200 wined3d: Add a comment about D3DSAMP_MAXMIPLEVEL. --- dlls/wined3d/basetexture.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 9633e01..a36d993 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -432,6 +432,10 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, } else { glValue = states[WINED3DTEXSTA_MAXMIPLEVEL]; } + /* Note that D3DSAMP_MAXMIPLEVEL specifies the biggest mipmap(default 0), while + * GL_TEXTURE_MAX_LEVEL specifies the smallest mimap used(default 1000). + * So D3DSAMP_MAXMIPLEVEL is the same as GL_TEXTURE_BASE_LEVEL. + */ glTexParameteri(textureDimensions, GL_TEXTURE_BASE_LEVEL, glValue); } }

1 0