January 2011 - Wine-commits

Gerald Pfeifer : cards: Fix description of cdtTerm.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: a55962cf412dc7387a6045ee07be8716c3ca18af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55962cf412dc7387a6045ee0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 1 14:34:30 2011 +0100 cards: Fix description of cdtTerm. --- dlls/cards/cards.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cards/cards.c b/dlls/cards/cards.c index 6a5a95f..f8f2b18 100644 --- a/dlls/cards/cards.c +++ b/dlls/cards/cards.c @@ -267,7 +267,7 @@ BOOL WINAPI cdtAnimate(HDC hdc, int cardback, int x, int y, int frame) /*********************************************************************** - * Frees resources reserved by cdtInitialize. + * Frees resources reserved by cdtInit. */ void WINAPI cdtTerm(void) {

1 0

Gerald Pfeifer : dbghelp: Also return a value in an error case in elf_map_file_read.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 061b50eda5e727cd6716832a983d3c47700434e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061b50eda5e727cd6716832a9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 1 14:32:05 2011 +0100 dbghelp: Also return a value in an error case in elf_map_file_read. --- dlls/dbghelp/elf_module.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index ff8b9d2..a64fe9f 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -261,7 +261,9 @@ static BOOL elf_map_file_read(struct image_file_map* fmap, struct elf_map_file_d return ReadProcessMemory(emfd->u.process.handle, (void*)((unsigned long)emfd->u.process.load_addr + (unsigned long)off), buf, len, &dw) && dw == len; - default: assert(0); + default: + assert(0); + return FALSE; } }

1 0

Greg Geldorp : ole32/tests: Fix crashes in usrmarshal.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 9c9762d1aba7efe07cc61a9999d2afbc8a0025ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9762d1aba7efe07cc61a999… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 10:55:07 2011 +0100 ole32/tests: Fix crashes in usrmarshal. --- dlls/ole32/tests/usrmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index a40e66b..7fdbdb6 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -182,6 +182,7 @@ static void test_marshal_HGLOBAL(void) wirehglobal += sizeof(ULONG); ok(*(ULONG *)wirehglobal == 0, "buffer+4 should be HGLOBAL\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + hglobal2 = NULL; HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); ok(hglobal2 == hglobal, "Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); @@ -227,6 +228,7 @@ static void test_marshal_HGLOBAL(void) ok(wirehglobal[i] == i, "buffer+0x%x should be %d\n", 0x10 + i, i); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + hglobal2 = NULL; HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); ok(hglobal2 != NULL, "Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer);

1 0

Greg Geldorp : user32/tests: Skip DefWindowProc tests on Vista+.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 4856c299ba04250b8e6140763b7f69b02a4bf47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4856c299ba04250b8e6140763… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 10:55:48 2011 +0100 user32/tests: Skip DefWindowProc tests on Vista+. --- dlls/user32/tests/class.c | 84 +++++++++++++++++++++++++------------------- 1 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 95f8aeb..ed288aa 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -617,6 +617,7 @@ static void test_builtinproc(void) static const WCHAR classW[] = {'d','e','f','t','e','s','t',0}; WCHAR unistring[] = {0x142, 0x40e, 0x3b4, 0}; /* a string that would be destroyed by a W->A->W conversion */ WNDPROC pDefWindowProcA, pDefWindowProcW; + WNDPROC pNtdllDefWindowProcA, pNtdllDefWindowProcW; WNDPROC oldproc; WNDCLASSEXA cls; /* the memory layout of WNDCLASSEXA and WNDCLASSEXW is the same */ WCHAR buf[128]; @@ -626,45 +627,56 @@ static void test_builtinproc(void) pDefWindowProcA = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcA"); pDefWindowProcW = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcW"); - - for (i = 0; i < 4; i++) + pNtdllDefWindowProcA = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtdllDefWindowProc_A"); + pNtdllDefWindowProcW = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtdllDefWindowProc_W"); + + /* On Vista+, the user32.dll export DefWindowProcA/W is forwarded to */ + /* ntdll.NtdllDefWindowProc_A/W. However, the wndproc returned by */ + /* GetClassLong/GetWindowLong points to an unexported user32 function */ + if (pDefWindowProcA == pNtdllDefWindowProcA && + pDefWindowProcW == pNtdllDefWindowProcW) + skip("user32.DefWindowProcX forwarded to ntdll.NtdllDefWindowProc_X\n"); + else { - ZeroMemory(&cls, sizeof(cls)); - cls.cbSize = sizeof(cls); - cls.hInstance = GetModuleHandle(NULL); - cls.hbrBackground = GetStockObject (WHITE_BRUSH); - if (i & 1) - cls.lpfnWndProc = pDefWindowProcA; - else - cls.lpfnWndProc = pDefWindowProcW; - - if (i & 2) - { - cls.lpszClassName = classA; - atom = RegisterClassExA(&cls); - } - else + for (i = 0; i < 4; i++) { - cls.lpszClassName = (LPCSTR)classW; - atom = RegisterClassExW((WNDCLASSEXW *)&cls); + ZeroMemory(&cls, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.hInstance = GetModuleHandle(NULL); + cls.hbrBackground = GetStockObject (WHITE_BRUSH); + if (i & 1) + cls.lpfnWndProc = pDefWindowProcA; + else + cls.lpfnWndProc = pDefWindowProcW; + + if (i & 2) + { + cls.lpszClassName = classA; + atom = RegisterClassExA(&cls); + } + else + { + cls.lpszClassName = (LPCSTR)classW; + atom = RegisterClassExW((WNDCLASSEXW *)&cls); + } + ok(atom != 0, "Couldn't register class, i=%d, %d\n", i, GetLastError()); + + hwnd = CreateWindowA(classA, NULL, 0, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), NULL); + ok(hwnd != NULL, "Couldn't create window i=%d\n", i); + + ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); + ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); + + ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); + ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); + + DestroyWindow(hwnd); + UnregisterClass((LPSTR)(DWORD_PTR)atom, GetModuleHandle(NULL)); } - ok(atom != 0, "Couldn't register class, i=%d, %d\n", i, GetLastError()); - - hwnd = CreateWindowA(classA, NULL, 0, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), NULL); - ok(hwnd != NULL, "Couldn't create window i=%d\n", i); - - ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); - ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); - - ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); - ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); - - DestroyWindow(hwnd); - UnregisterClass((LPSTR)(DWORD_PTR)atom, GetModuleHandle(NULL)); } /* built-in winproc - window A/W type automatically detected */

1 0

Greg Geldorp : winmm/tests: Don't use same buffer for both input and output .
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: fa973b812dc245e80f4b9ad5e6c066cb2ce69000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa973b812dc245e80f4b9ad5e… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 10:55:27 2011 +0100 winmm/tests: Don't use same buffer for both input and output. --- dlls/winmm/tests/mmio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0326a1a..e175083 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -65,7 +65,7 @@ static void test_mmioDescend(char *fname) MMRESULT ret; HMMIO hmmio; MMIOINFO mmio; - MMCKINFO ckRiff, ckList, ck; + MMCKINFO ckRiff, ckList, ck, ckList2; memset(&mmio, 0, sizeof(mmio)); mmio.fccIOProc = fname ? FOURCC_DOS : FOURCC_MEM; @@ -118,17 +118,17 @@ static void test_mmioDescend(char *fname) ret = mmioSeek(hmmio, ck.cksize, SEEK_CUR); ok(ret == 0x58, "expected 0x58, got %#x\n", ret); - ret = mmioDescend(hmmio, &ckList, &ckList, 0); + ret = mmioDescend(hmmio, &ckList2, &ckList, 0); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); - ok(ckList.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ckList.ckid); - ok(ckList.fccType == listtypeSTREAMHEADER, "wrong fccType: %04x\n", ckList.fccType); + ok(ckList2.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ckList2.ckid); + ok(ckList2.fccType == listtypeSTREAMHEADER, "wrong fccType: %04x\n", ckList2.fccType); trace("ckid %4.4s cksize %04x fccType %4.4s off %04x flags %04x\n", - (LPCSTR)&ckList.ckid, ckList.cksize, (LPCSTR)&ckList.fccType, - ckList.dwDataOffset, ckList.dwFlags); + (LPCSTR)&ckList2.ckid, ckList2.cksize, (LPCSTR)&ckList2.fccType, + ckList2.dwDataOffset, ckList2.dwFlags); expect_buf_offset(hmmio, 100); - ret = mmioDescend(hmmio, &ck, &ckList, 0); + ret = mmioDescend(hmmio, &ck, &ckList2, 0); ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret); ok(ck.ckid == ckidSTREAMHEADER, "wrong ckid: %04x\n", ck.ckid); ok(ck.fccType == 0, "wrong fccType: %04x\n", ck.fccType);

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_lod().
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 482a5fd030846c5d90b97db75f167d1a4277f448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482a5fd030846c5d90b97db75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 2 12:26:35 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_lod(). --- dlls/wined3d/basetexture.c | 35 +++++++++++++++++------------------ dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index cd1b687..d1d7f10 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -127,34 +127,33 @@ void basetexture_unload(IWineD3DBaseTextureImpl *texture) resource_unload((IWineD3DResourceImpl *)texture); } -DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD LODNew) +DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - DWORD old = This->baseTexture.LOD; + DWORD old = texture->baseTexture.LOD; + + TRACE("texture %p, lod %u.\n", texture, 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) { - TRACE("Ignoring SetLOD on %s texture, returning 0\n", debug_d3dpool(This->resource.pool)); + * textures. The call always returns 0, and GetLOD always returns 0. */ + if (texture->resource.pool != WINED3DPOOL_MANAGED) + { + TRACE("Ignoring SetLOD on %s texture, returning 0.\n", debug_d3dpool(texture->resource.pool)); return 0; } - if (LODNew >= This->baseTexture.level_count) - LODNew = This->baseTexture.level_count - 1; + if (lod >= texture->baseTexture.level_count) + lod = texture->baseTexture.level_count - 1; - if(This->baseTexture.LOD != LODNew) { - This->baseTexture.LOD = LODNew; + if (texture->baseTexture.LOD != lod) + { + texture->baseTexture.LOD = lod; - This->baseTexture.texture_rgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; - This->baseTexture.texture_srgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; - if(This->baseTexture.bindCount) { - IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_SAMPLER(This->baseTexture.sampler)); - } + texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; + texture->baseTexture.texture_srgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; + if (texture->baseTexture.bindCount) + IWineD3DDeviceImpl_MarkStateDirty(texture->resource.device, STATE_SAMPLER(texture->baseTexture.sampler)); } - TRACE("(%p) : set LOD to %d\n", This, This->baseTexture.LOD); - return old; } diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index da39701..f82b02e 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -247,7 +247,7 @@ static void * WINAPI IWineD3DCubeTextureImpl_GetParent(IWineD3DCubeTexture *ifac IWineD3DCubeTexture IWineD3DBaseTexture parts follow ****************************************************** */ static DWORD WINAPI IWineD3DCubeTextureImpl_SetLOD(IWineD3DCubeTexture *iface, DWORD LODNew) { - return basetexture_set_lod((IWineD3DBaseTexture *)iface, LODNew); + return basetexture_set_lod((IWineD3DBaseTextureImpl *)iface, LODNew); } static DWORD WINAPI IWineD3DCubeTextureImpl_GetLOD(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d3a757f..2bda3d6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -238,7 +238,7 @@ static void * WINAPI IWineD3DTextureImpl_GetParent(IWineD3DTexture *iface) IWineD3DTexture IWineD3DBaseTexture parts follow ****************************************************** */ static DWORD WINAPI IWineD3DTextureImpl_SetLOD(IWineD3DTexture *iface, DWORD LODNew) { - return basetexture_set_lod((IWineD3DBaseTexture *)iface, LODNew); + return basetexture_set_lod((IWineD3DBaseTextureImpl *)iface, LODNew); } static DWORD WINAPI IWineD3DTextureImpl_GetLOD(IWineD3DTexture *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index b2a6102..7ec81f1 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -202,7 +202,7 @@ static void * WINAPI IWineD3DVolumeTextureImpl_GetParent(IWineD3DVolumeTexture * IWineD3DVolumeTexture IWineD3DBaseTexture parts follow ****************************************************** */ static DWORD WINAPI IWineD3DVolumeTextureImpl_SetLOD(IWineD3DVolumeTexture *iface, DWORD LODNew) { - return basetexture_set_lod((IWineD3DBaseTexture *)iface, LODNew); + return basetexture_set_lod((IWineD3DBaseTextureImpl *)iface, LODNew); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLOD(IWineD3DVolumeTexture *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e73776e..49c1f6f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1927,7 +1927,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; -DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod) DECLSPEC_HIDDEN; +DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN; void basetexture_unload(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_lod().
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 54e1aeeb62bab0e10b4f4f2f852bb6306d77a513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e1aeeb62bab0e10b4f4f2f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 2 12:26:36 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_lod(). --- dlls/wined3d/basetexture.c | 8 +++----- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d1d7f10..15a58fd 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -157,13 +157,11 @@ DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) return old; } -DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) +DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - - TRACE("(%p) : returning %d\n", This, This->baseTexture.LOD); + TRACE("texture %p, returning %u.\n", texture, texture->baseTexture.LOD); - return This->baseTexture.LOD; + return texture->baseTexture.LOD; } DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index f82b02e..ffd0da6 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -251,7 +251,7 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_SetLOD(IWineD3DCubeTexture *iface, D } static DWORD WINAPI IWineD3DCubeTextureImpl_GetLOD(IWineD3DCubeTexture *iface) { - return basetexture_get_lod((IWineD3DBaseTexture *)iface); + return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface); } static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *iface) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2bda3d6..6acd737 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -242,7 +242,7 @@ static DWORD WINAPI IWineD3DTextureImpl_SetLOD(IWineD3DTexture *iface, DWORD LOD } static DWORD WINAPI IWineD3DTextureImpl_GetLOD(IWineD3DTexture *iface) { - return basetexture_get_lod((IWineD3DBaseTexture *)iface); + return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface); } static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 7ec81f1..7606e99 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -206,7 +206,7 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_SetLOD(IWineD3DVolumeTexture *ifac } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLOD(IWineD3DVolumeTexture *iface) { - return basetexture_get_lod((IWineD3DBaseTexture *)iface); + return basetexture_get_lod((IWineD3DBaseTextureImpl *)iface); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 49c1f6f..af542d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1917,7 +1917,7 @@ void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; -DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) DECLSPEC_HIDDEN; HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UINT level_count,

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_autogen_filter_type ().
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 568f9ecb22414c236670953b66ab666961b281d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568f9ecb22414c236670953b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 2 12:26:37 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_autogen_filter_type(). --- dlls/wined3d/basetexture.c | 88 ++++++++++++++++++++------------------- dlls/wined3d/cubetexture.c | 6 ++- dlls/wined3d/texture.c | 6 ++- dlls/wined3d/volumetexture.c | 6 ++- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 58 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 15a58fd..d1c27e8 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -170,50 +170,52 @@ DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) return texture->baseTexture.level_count; } -HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) +HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WINED3DTEXTUREFILTERTYPE filter_type) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.device; - GLenum textureDimensions = This->baseTexture.target; - - if (!(This->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP)) { - TRACE("(%p) : returning invalid call\n", This); - return WINED3DERR_INVALIDCALL; - } - if(This->baseTexture.filterType != FilterType) { - /* What about multithreading? Do we want all the context overhead just to set this value? - * Or should we delay the applying until the texture is used for drawing? For now, apply - * immediately. - */ - struct wined3d_context *context = context_acquire(device, NULL); - - ENTER_GL(); - glBindTexture(textureDimensions, This->baseTexture.texture_rgb.name); - checkGLcall("glBindTexture"); - switch(FilterType) { - case WINED3DTEXF_NONE: - case WINED3DTEXF_POINT: - glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST); - checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST)"); - - break; - case WINED3DTEXF_LINEAR: - glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); - checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); - - break; - default: - WARN("Unexpected filter type %d, setting to GL_NICEST\n", FilterType); - glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); - checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); - } - LEAVE_GL(); - - context_release(context); - } - This->baseTexture.filterType = FilterType; - TRACE("(%p) :\n", This); - return WINED3D_OK; + TRACE("texture %p, filter_type %s.\n", texture, debug_d3dtexturefiltertype(filter_type)); + + if (!(texture->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP)) + { + WARN("Texture doesn't have AUTOGENMIPMAP usage.\n"); + return WINED3DERR_INVALIDCALL; + } + + if (texture->baseTexture.filterType != filter_type) + { + GLenum target = texture->baseTexture.target; + struct wined3d_context *context; + + context = context_acquire(texture->resource.device, NULL); + + ENTER_GL(); + glBindTexture(target, texture->baseTexture.texture_rgb.name); + checkGLcall("glBindTexture"); + switch (filter_type) + { + case WINED3DTEXF_NONE: + case WINED3DTEXF_POINT: + glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST); + checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST)"); + break; + + case WINED3DTEXF_LINEAR: + glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); + checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); + break; + + default: + WARN("Unexpected filter type %#x, setting to GL_NICEST.\n", filter_type); + glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); + checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); + break; + } + LEAVE_GL(); + + context_release(context); + } + texture->baseTexture.filterType = filter_type; + + return WINED3D_OK; } WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ffd0da6..8dc2579 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -259,8 +259,10 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *i return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } -static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { - return basetexture_set_autogen_filter_type((IWineD3DBaseTexture *)iface, FilterType); +static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeTexture *iface, + WINED3DTEXTUREFILTERTYPE FilterType) +{ + return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterType(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6acd737..63cf182 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -250,8 +250,10 @@ static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface) return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } -static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { - return basetexture_set_autogen_filter_type((IWineD3DBaseTexture *)iface, FilterType); +static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture *iface, + WINED3DTEXTUREFILTERTYPE FilterType) +{ + return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType(IWineD3DTexture *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 7606e99..a69049d 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -214,8 +214,10 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTextur return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVolumeTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { - return basetexture_set_autogen_filter_type((IWineD3DBaseTexture *)iface, FilterType); +static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVolumeTexture *iface, + WINED3DTEXTUREFILTERTYPE FilterType) +{ + return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilterType(IWineD3DVolumeTexture *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af542d4..d8647e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1924,7 +1924,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, +HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_autogen_filter_type ().
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 9de4433dbe889d921d8402846ce51caf32e6cb06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de4433dbe889d921d8402846… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 2 12:26:38 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_autogen_filter_type(). --- dlls/wined3d/basetexture.c | 8 +++----- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d1c27e8..0c3a67a 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -218,13 +218,11 @@ HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WI return WINED3D_OK; } -WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) +WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - - FIXME("(%p) : stub\n", This); + TRACE("texture %p.\n", texture); - return This->baseTexture.filterType; + return texture->baseTexture.filterType; } void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 8dc2579..8ef8320 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -265,8 +265,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeT return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } -static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterType(IWineD3DCubeTexture *iface) { - return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); +static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterType(IWineD3DCubeTexture *iface) +{ + return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 63cf182..a4b7b36 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -256,8 +256,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture * return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } -static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType(IWineD3DTexture *iface) { - return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); +static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType(IWineD3DTexture *iface) +{ + return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index a69049d..3d02895 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -220,8 +220,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVol return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } -static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilterType(IWineD3DVolumeTexture *iface) { - return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); +static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilterType(IWineD3DVolumeTexture *iface) +{ + return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8647e8..23d1fd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1915,7 +1915,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; -WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture,

1 0

Alexandre Julliard : configure: Output maintainer-mode rules directly from configure.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 5eee920441408adf9fdc961ac747bc419186e017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eee920441408adf9fdc961ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 1 12:04:45 2011 +0100 configure: Output maintainer-mode rules directly from configure. --- Makefile.in | 8 -------- configure | 11 +++++++++++ configure.ac | 11 +++++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index eec29bc..b1e790e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,14 +33,6 @@ WINAPI_CHECK_EXTRA_FLAGS = --global # Rules for re-running configure -$(srcdir)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4 - cd $(srcdir) && autoconf --warnings=all - -$(srcdir)/include/config.h.in: @MAINTAINER_MODE@ include/stamp-h.in -$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 - cd $(srcdir) && autoheader --warnings=all - @echo timestamp > $@ - config.status: configure @./config.status --recheck diff --git a/configure b/configure index 6da7a5d..c9dac48 100755 --- a/configure +++ b/configure @@ -15391,6 +15391,17 @@ ac_config_files="$ac_config_files Make.tmp:Make.vars.in:Makefile.in" +if test "x$enable_maintainer_mode" = xyes +then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(srcdir)/configure: configure.ac aclocal.m4 + cd \$(srcdir) && autoconf --warnings=all + +\$(srcdir)/include/config.h.in: include/stamp-h.in +\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 + cd \$(srcdir) && autoheader --warnings=all + @echo timestamp > \$@" +fi + if test -n "$with_wine64" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader diff --git a/configure.ac b/configure.ac index eb166ee..3f06551 100644 --- a/configure.ac +++ b/configure.ac @@ -2939,6 +2939,17 @@ AC_CONFIG_FILES([Make.tmp:Make.vars.in:Makefile.in]) dnl Some final makefile rules +if test "x$enable_maintainer_mode" = xyes +then + WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], +[\$(srcdir)/configure: configure.ac aclocal.m4 + cd \$(srcdir) && autoconf --warnings=all +\$(srcdir)/include/config.h.in: include/stamp-h.in +\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 + cd \$(srcdir) && autoheader --warnings=all + @echo timestamp > \$[@]]) +fi + if test -n "$with_wine64" then WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],

1 0