July 2006 - Wine-commits - list.winehq.org

Vitaliy Margolen : dinput: Initialize event sequence counter. And simplify code.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 7f838ca661545a49a6342508aee5ad90ad0e271a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f838ca661545a49a634250… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Jul 30 23:32:30 2006 -0600 dinput: Initialize event sequence counter. And simplify code. --- dlls/dinput/dinput_main.c | 100 ++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 60 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 369984d..cef61b7 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -84,55 +84,50 @@ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { - IDirectInputImpl* This; + IDirectInputImpl* This; + HRESULT res = DIERR_OLDDIRECTINPUTVERSION; + LPCVOID vtable = NULL; - TRACE("(%p,%04lx,%s,%p,%p)\n", hinst,dwVersion,debugstr_guid(riid),ppDI,punkOuter); + TRACE("(%p,%04lx,%s,%p,%p)\n", hinst,dwVersion,debugstr_guid(riid),ppDI,punkOuter); - if (IsEqualGUID(&IID_IDirectInputA,riid) || - IsEqualGUID(&IID_IDirectInput2A,riid) || - IsEqualGUID(&IID_IDirectInput7A,riid)) { - This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); - This->lpVtbl = &ddi7avt; - This->ref = 1; - This->dwVersion = dwVersion; - *ppDI = This; - - return DI_OK; - } - - if (IsEqualGUID(&IID_IDirectInputW,riid) || - IsEqualGUID(&IID_IDirectInput2W,riid) || - IsEqualGUID(&IID_IDirectInput7W,riid)) { - This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); - This->lpVtbl = &ddi7wvt; - This->ref = 1; - This->dwVersion = dwVersion; - *ppDI = This; - - return DI_OK; - } - - if (IsEqualGUID(&IID_IDirectInput8A,riid)) { - This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); - This->lpVtbl = &ddi8avt; - This->ref = 1; - This->dwVersion = dwVersion; - *ppDI = This; + if (IsEqualGUID(&IID_IDirectInputA,riid) || + IsEqualGUID(&IID_IDirectInput2A,riid) || + IsEqualGUID(&IID_IDirectInput7A,riid)) + { + vtable = &ddi7avt; + res = DI_OK; + } - return DI_OK; - } + if (IsEqualGUID(&IID_IDirectInputW,riid) || + IsEqualGUID(&IID_IDirectInput2W,riid) || + IsEqualGUID(&IID_IDirectInput7W,riid)) + { + vtable = &ddi7wvt; + res = DI_OK; + } - if (IsEqualGUID(&IID_IDirectInput8W,riid)) { - This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); - This->lpVtbl = &ddi8wvt; - This->ref = 1; - This->dwVersion = dwVersion; - *ppDI = This; + if (IsEqualGUID(&IID_IDirectInput8A,riid)) + { + vtable = &ddi8avt; + res = DI_OK; + } - return DI_OK; - } + if (IsEqualGUID(&IID_IDirectInput8W,riid)) + { + vtable = &ddi8wvt; + res = DI_OK; + } - return DIERR_OLDDIRECTINPUTVERSION; + if (res == DI_OK) + { + This = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectInputImpl)); + This->lpVtbl = vtable; + This->ref = 1; + This->dwVersion = dwVersion; + This->evsequence = 1; + *ppDI = This; + } + return res; } /****************************************************************************** @@ -140,15 +135,7 @@ HRESULT WINAPI DirectInputCreateEx( */ HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) { - IDirectInputImpl* This; - TRACE("(%p,%04lx,%p,%p)\n", hinst,dwVersion,ppDI,punkOuter); - This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); - This->lpVtbl = &ddi7avt; - This->ref = 1; - This->dwVersion = dwVersion; - *ppDI = (IDirectInputA*)This; - return 0; - + return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7A, (LPVOID *)ppDI, punkOuter); } /****************************************************************************** @@ -156,14 +143,7 @@ HRESULT WINAPI DirectInputCreateA(HINSTA */ HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) { - IDirectInputImpl* This; - TRACE("(%p,%04lx,%p,%p)\n", hinst,dwVersion,ppDI,punkOuter); - This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); - This->lpVtbl = &ddi7wvt; - This->ref = 1; - This->dwVersion = dwVersion; - *ppDI = (IDirectInputW*)This; - return 0; + return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) {

1 0

Robert Reif : advapi32: Print more info about failed test.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: accfc06c7a094d101bd972bc14c23ba8eb677aec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=accfc06c7a094d101bd972b… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Jul 29 07:41:01 2006 -0400 advapi32: Print more info about failed test. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 790ee8b..e6a7d7d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -738,7 +738,7 @@ static void test_token_attr(void) Name[0] = '\0'; Domain[0] = '\0'; ret = LookupAccountSid(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); - ok(ret, "LookupAccountSid failed with error %ld\n", GetLastError()); + ok(ret, "LookupAccountSid(%s) failed with error %ld\n", SidString, GetLastError()); trace("\t%s, %s\\%s use: %d attr: 0x%08lx\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); LocalFree(SidString); }

1 0

Robert Reif : advapi32: Add string sid tests.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 76fe25241d625fc1a2e4bb986d450e226bb55513 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76fe25241d625fc1a2e4bb9… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Jul 29 07:45:23 2006 -0400 advapi32: Add string sid tests. --- dlls/advapi32/tests/security.c | 57 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e6a7d7d..3b0ff83 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -73,6 +73,23 @@ static void init(void) hmod = GetModuleHandle("advapi32.dll"); } +static void test_str_sid(char *str_sid) +{ + PSID psid; + char *temp; + + if (pConvertStringSidToSidA(str_sid, &psid)) + { + if (pConvertSidToStringSidA(psid, &temp)) + { + trace(" %s: %s\n", str_sid, temp); + LocalFree(temp); + } + } + else + trace("%s couldn't be converted\n", str_sid); +} + static void test_sid(void) { struct sidRef refs[] = { @@ -162,6 +179,46 @@ static void test_sid(void) if( psid ) LocalFree( psid ); } + + trace("String SIDs:\n"); + test_str_sid("AO"); + test_str_sid("RU"); + test_str_sid("AN"); + test_str_sid("AU"); + test_str_sid("BA"); + test_str_sid("BG"); + test_str_sid("BO"); + test_str_sid("BU"); + test_str_sid("CA"); + test_str_sid("CG"); + test_str_sid("CO"); + test_str_sid("DA"); + test_str_sid("DC"); + test_str_sid("DD"); + test_str_sid("DG"); + test_str_sid("DU"); + test_str_sid("EA"); + test_str_sid("ED"); + test_str_sid("WD"); + test_str_sid("PA"); + test_str_sid("IU"); + test_str_sid("LA"); + test_str_sid("LG"); + test_str_sid("LS"); + test_str_sid("SY"); + test_str_sid("NU"); + test_str_sid("NO"); + test_str_sid("NS"); + test_str_sid("PO"); + test_str_sid("PS"); + test_str_sid("PU"); + test_str_sid("RS"); + test_str_sid("RD"); + test_str_sid("RE"); + test_str_sid("RC"); + test_str_sid("SA"); + test_str_sid("SO"); + test_str_sid("SU"); } static void test_trustee(void)

1 0

Robert Reif : advapi32: Make ADVAPI_IsLocalComputer global and remove duplicate copy.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 3f000d8c717bca14310871f8ea1119154f5bae09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f000d8c717bca14310871f… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Jul 29 08:12:58 2006 -0400 advapi32: Make ADVAPI_IsLocalComputer global and remove duplicate copy. Make debugstr_sid global. --- dlls/advapi32/advapi32_misc.h | 26 ++++++++++++++++++++++++++ dlls/advapi32/lsa.c | 25 +------------------------ dlls/advapi32/security.c | 5 +++-- 3 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 dlls/advapi32/advapi32_misc.h diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h new file mode 100644 index 0000000..436c0fe --- /dev/null +++ b/dlls/advapi32/advapi32_misc.h @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2006 Robert Reif + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef __WINE_ADVAPI32MISC_H +#define __WINE_ADVAPI32MISC_H + +const char * debugstr_sid(PSID sid); +BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName); + +#endif /* __WINE_ADVAPI32MISC_H */ diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 6e70345..62b2075 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "winreg.h" #include "winternl.h" #include "ntsecapi.h" +#include "advapi32_misc.h" #include "wine/debug.h" @@ -54,30 +55,6 @@ static void dumpLsaAttributes(PLSA_OBJEC } } -/************************************************************ - * ADVAPI_IsLocalComputer - * - * Checks whether the server name indicates local machine. - */ -static BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) -{ - DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; - BOOL Result; - LPWSTR buf; - - if (!ServerName || !ServerName[0]) - return TRUE; - - buf = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); - Result = GetComputerNameW(buf, &dwSize); - if (Result && (ServerName[0] == '\\') && (ServerName[1] == '\\')) - ServerName += 2; - Result = Result && !lstrcmpW(ServerName, buf); - HeapFree(GetProcessHeap(), 0, buf); - - return Result; -} - /****************************************************************************** * LsaAddAccountRights [ADVAPI32.@] * diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 658fa44..d2a5d81 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -35,6 +35,7 @@ #include "accctrl.h" #include "sddl.h" #include "winsvc.h" #include "aclapi.h" +#include "advapi32_misc.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -239,7 +240,7 @@ static const WCHAR SDDL_INHERITED[] static const WCHAR SDDL_AUDIT_SUCCESS[] = {'S','A',0}; static const WCHAR SDDL_AUDIT_FAILURE[] = {'F','A',0}; -static const char * debugstr_sid(PSID sid) +const char * debugstr_sid(PSID sid) { int auth = 0; SID * psid = (SID *)sid; @@ -322,7 +323,7 @@ static void GetWorldAccessACL(PACL pACL) * * Checks whether the server name indicates local machine. */ -static BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) +BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) { DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; BOOL Result;

1 0

Mike McCormack : ole32: Add function parameters to FIXME messages.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 6ede65596a7700ec4aa51c055955f4c625bf8c72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ede65596a7700ec4aa51c0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Aug 1 01:00:36 2006 +0900 ole32: Add function parameters to FIXME messages. --- dlls/ole32/storage32.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5119571..acc41c4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1618,7 +1618,9 @@ static HRESULT WINAPI StorageImpl_MoveEl const OLECHAR *pwcsNewName,/* [string][in] */ DWORD grfFlags) /* [in] */ { - FIXME("not implemented!\n"); + FIXME("(%p %s %p %s %lu): stub\n", iface, + debugstr_w(pwcsName), pstgDest, + debugstr_w(pwcsNewName), grfFlags); return E_NOTIMPL; } @@ -1636,7 +1638,7 @@ static HRESULT WINAPI StorageImpl_Commit IStorage* iface, DWORD grfCommitFlags)/* [in] */ { - FIXME("(%ld): stub!\n", grfCommitFlags); + FIXME("(%p %ld): stub\n", iface, grfCommitFlags); return S_OK; } @@ -1648,7 +1650,7 @@ static HRESULT WINAPI StorageImpl_Commit static HRESULT WINAPI StorageImpl_Revert( IStorage* iface) { - FIXME("not implemented!\n"); + FIXME("(%p): stub\n", iface); return E_NOTIMPL; }

1 0

Mike McCormack : ole32: Add a test showing what STGM_TRANSACTED does for streams.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 24e69d544bb5858e2eda6ccaed112b7eaf30f0ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24e69d544bb5858e2eda6cc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Aug 1 01:00:25 2006 +0900 ole32: Add a test showing what STGM_TRANSACTED does for streams. --- dlls/ole32/storage32.c | 7 ++--- dlls/ole32/tests/storage32.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 520689b..5119571 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -323,7 +323,8 @@ static HRESULT WINAPI StorageBaseImpl_Op /* * Validate the STGM flags */ - if ( FAILED( validateSTGM(grfMode) )) + if ( FAILED( validateSTGM(grfMode) ) || + STGM_SHARE_MODE(grfMode) != STGM_SHARE_EXCLUSIVE) { res = STG_E_INVALIDFLAG; goto end; @@ -332,9 +333,7 @@ static HRESULT WINAPI StorageBaseImpl_Op /* * As documented. */ - if ( STGM_SHARE_MODE(grfMode) != STGM_SHARE_EXCLUSIVE || - (grfMode & STGM_DELETEONRELEASE) || - (grfMode & STGM_TRANSACTED) ) + if ( (grfMode & STGM_DELETEONRELEASE) || (grfMode & STGM_TRANSACTED) ) { res = STG_E_INVALIDFUNCTION; goto end; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 0ba82f2..f3b9b27 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -835,6 +835,64 @@ static void test_streamenum(void) DeleteFileW(filename); } +static void test_transact(void) +{ + static const WCHAR szPrefix[] = { 's','t','g',0 }; + static const WCHAR szDot[] = { '.',0 }; + WCHAR filename[MAX_PATH]; + IStorage *stg = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + + if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) + return; + + DeleteFileW(filename); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* now create a stream, but don't commit it */ + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Release(stm); + + IStorage_Release(stg); + + stm = NULL; + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_SHARE_DENY_NONE | STGM_READ | STGM_TRANSACTED, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed\n"); + + if (!stg) + return; + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_DENY_NONE|STGM_READ, 0, &stm ); + ok(r==STG_E_INVALIDFLAG, "IStorage->OpenStream failed %08lx\n", r); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_DELETEONRELEASE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08lx\n", r); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08lx\n", r); + + todo_wine { + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08lx\n", r); + } + + if (stm) + r = IStream_Release(stm); + IStorage_Release(stg); + + r = DeleteFileW(filename); + ok( r == TRUE, "deleted file\n"); +} + START_TEST(storage32) { test_hglobal_storage_stat(); @@ -844,4 +902,5 @@ START_TEST(storage32) test_storage_suminfo(); test_storage_refcount(); test_streamenum(); + test_transact(); }

1 0

H. Verbeet : ddraw: Order Z-buffer formats by depth buffer bit depths in IDirect3DImpl_7_EnumZBufferFormats .
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 6add05d33b11f7d0e96778decdad8f3ddace83e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6add05d33b11f7d0e96778d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 30 23:28:24 2006 +0200 ddraw: Order Z-buffer formats by depth buffer bit depths in IDirect3DImpl_7_EnumZBufferFormats. --- dlls/ddraw/direct3d.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 19c2e8c..db9fa7d 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1053,13 +1053,15 @@ IDirect3DImpl_7_EnumZBufferFormats(IDire HRESULT hr; int i; + /* Order matters. Specifically, BattleZone II (full version) expects the + * 16-bit depth formats to be listed before the 24 and 32 ones. */ WINED3DFORMAT FormatList[] = { - WINED3DFMT_D32, WINED3DFMT_D15S1, - WINED3DFMT_D24S8, + WINED3DFMT_D16, WINED3DFMT_D24X8, WINED3DFMT_D24X4S4, - WINED3DFMT_D16 + WINED3DFMT_D24S8, + WINED3DFMT_D32 }; TRACE("(%p)->(%s,%p,%p): Relay\n", iface, debugstr_guid(refiidDevice), Callback, Context);

1 0

H. Verbeet : wined3d: Use GL_LIMITS(samplers) instead of GL_LIMITS( sampler_stages) in IWineD3DSurfaceImpl_UnlockRect.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 56395ca5f30ff2aed0a86406036c80c53a22c4d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56395ca5f30ff2aed0a8640… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 30 23:26:37 2006 +0200 wined3d: Use GL_LIMITS(samplers) instead of GL_LIMITS(sampler_stages) in IWineD3DSurfaceImpl_UnlockRect. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index de9322b..67cd009 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1130,7 +1130,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp } /* Disable higher textures before calling glDrawPixels */ - for(tex = 1; tex < GL_LIMITS(sampler_stages); tex++) { + for(tex = 1; tex < GL_LIMITS(samplers); tex++) { if (GL_SUPPORT(ARB_MULTITEXTURE)) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + tex)); checkGLcall("glActiveTextureARB");

1 0

H. Verbeet : wined3d: Improve IWineD3DDeviceImpl_CreateTexture trace.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: c6c6cf1f51efdcd7f4eaab8208d3f2aeb9804087 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6c6cf1f51efdcd7f4eaab8… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 30 23:26:21 2006 +0200 wined3d: Improve IWineD3DDeviceImpl_CreateTexture trace. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2185054..17a9cbb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1123,7 +1123,9 @@ static HRESULT WINAPI IWineD3DDeviceImp unsigned int pow2Height = Height; - TRACE("(%p), Width(%d) Height(%d) Levels(%d) Usage(%ld) ....\n", This, Width, Height, Levels, Usage); + TRACE("(%p) : Width %d, Height %d, Levels %d, Usage %#lx\n", This, Width, Height, Levels, Usage); + TRACE("Format %#x (%s), Pool %#x, ppTexture %p, pSharedHandle %p, parent %p\n", + Format, debug_d3dformat(Format), Pool, ppTexture, pSharedHandle, parent); /* TODO: It should only be possible to create textures for formats that are reported as supported */

1 0

H. Verbeet : wined3d: Split the GLSL check in a check for GLSL vertex shaders and one for GLSL fragment shaders .
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: d5238cfb388e33250d82524e5890a31670f6c178 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5238cfb388e33250d82524… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 30 23:28:10 2006 +0200 wined3d: Split the GLSL check in a check for GLSL vertex shaders and one for GLSL fragment shaders. --- dlls/wined3d/directx.c | 29 ++++++++++++++++++----------- include/wine/wined3d_gl.h | 3 ++- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index faaff47..1fa4a5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -216,7 +216,7 @@ static void select_shader_mode( *vs_selected = SHADER_NONE; } else if (DeviceType == WINED3DDEVTYPE_REF || wined3d_settings.vs_mode == VS_SW) { *vs_selected = SHADER_SW; - } else if (gl_info->supported[ARB_SHADING_LANGUAGE_100] && wined3d_settings.glslRequested) { + } else if (gl_info->supported[ARB_VERTEX_SHADER] && wined3d_settings.glslRequested) { *vs_selected = SHADER_GLSL; } else if (gl_info->supported[ARB_VERTEX_PROGRAM]) { *vs_selected = SHADER_ARB; @@ -229,7 +229,7 @@ static void select_shader_mode( *ps_selected = SHADER_NONE; } else if (DeviceType == WINED3DDEVTYPE_REF) { *ps_selected = SHADER_NONE; - } else if (gl_info->supported[ARB_SHADING_LANGUAGE_100] && wined3d_settings.glslRequested) { + } else if (gl_info->supported[ARB_FRAGMENT_SHADER] && wined3d_settings.glslRequested) { *ps_selected = SHADER_GLSL; } else if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { *ps_selected = SHADER_ARB; @@ -521,6 +521,10 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *i gl_info->vs_arb_version = VS_VERSION_NOT_SUPPORTED; gl_info->vs_nv_version = VS_VERSION_NOT_SUPPORTED; gl_info->vs_ati_version = VS_VERSION_NOT_SUPPORTED; + gl_info->vs_glsl_constantsF = 0; + gl_info->ps_glsl_constantsF = 0; + gl_info->vs_arb_constantsF = 0; + gl_info->ps_arb_constantsF = 0; /* Now work out what GL support this card really has */ #define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) glXGetProcAddressARB( (const GLubyte *) #pfn); @@ -576,18 +580,14 @@ #undef USE_GL_FUNC GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); TRACE_(d3d_caps)(" FOUND: ARB Pixel Shader support - max float constants=%u\n", gl_max); gl_info->ps_arb_constantsF = gl_max; + } else if (strcmp(ThisExtn, "GL_ARB_fragment_shader") == 0) { + gl_info->supported[ARB_FRAGMENT_SHADER] = TRUE; + glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &gl_max); + TRACE_(d3d_caps)(" FOUND: ARB_fragment_shader (GLSL) support - max float ps constants=%u\n", gl_max); + gl_info->ps_glsl_constantsF = gl_max; } else if (strcmp(ThisExtn, "GL_ARB_imaging") == 0) { TRACE_(d3d_caps)(" FOUND: ARB imaging support\n"); gl_info->supported[ARB_IMAGING] = TRUE; - } else if (strcmp(ThisExtn, "GL_ARB_shading_language_100") == 0) { - TRACE_(d3d_caps)(" FOUND: GL Shading Language v100 support\n"); - gl_info->supported[ARB_SHADING_LANGUAGE_100] = TRUE; - glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max); - TRACE_(d3d_caps)(" FOUND: GL Shading Language support - max float vs constants=%u\n", gl_max); - gl_info->vs_glsl_constantsF = gl_max; - glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &gl_max); - TRACE_(d3d_caps)(" FOUND: GL Shading Language support - max float ps constants=%u\n", gl_max); - gl_info->ps_glsl_constantsF = gl_max; } else if (strcmp(ThisExtn, "GL_ARB_multisample") == 0) { TRACE_(d3d_caps)(" FOUND: ARB Multisample support\n"); gl_info->supported[ARB_MULTISAMPLE] = TRUE; @@ -637,6 +637,11 @@ #undef USE_GL_FUNC GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); TRACE_(d3d_caps)(" FOUND: ARB Vertex Shader support - max float constants=%u\n", gl_max); gl_info->vs_arb_constantsF = gl_max; + } else if (strcmp(ThisExtn, "GL_ARB_vertex_shader") == 0) { + gl_info->supported[ARB_VERTEX_SHADER] = TRUE; + glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max); + TRACE_(d3d_caps)(" FOUND: ARB_vertex_shader (GLSL) support - max float vs constants=%u\n", gl_max); + gl_info->vs_glsl_constantsF = gl_max; } else if (strcmp(ThisExtn, "GL_ARB_vertex_blend") == 0) { glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max); TRACE_(d3d_caps)(" FOUND: ARB Vertex Blend support GL_MAX_VERTEX_UNITS_ARB %d\n", gl_max); @@ -766,6 +771,8 @@ #undef USE_GL_FUNC if (*GL_Extensions == ' ') GL_Extensions++; } } + checkGLcall("extension detection\n"); + gl_info->max_sampler_stages = max(gl_info->max_samplers, gl_info->max_texture_stages); /* Load all the lookup tables diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index a0b96d6..d9b075c 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1345,6 +1345,7 @@ #define MAKEDWORD_VERSION(maj, min) ((m typedef enum _GL_SupportedExt { /* ARB */ ARB_FRAGMENT_PROGRAM, + ARB_FRAGMENT_SHADER, ARB_IMAGING, ARB_MULTISAMPLE, ARB_MULTITEXTURE, @@ -1362,7 +1363,7 @@ typedef enum _GL_SupportedExt { ARB_VERTEX_PROGRAM, ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT, - ARB_SHADING_LANGUAGE_100, + ARB_VERTEX_SHADER, /* EXT */ EXT_FOG_COORD, EXT_FRAMEBUFFER_OBJECT,

1 0