wine-commits January 2009

wine-commits@winehq.org

3 participants
1348 discussions

Michael Stefaniuc : dmscript: Remove superfluous pointer casts.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: d62a0eec7b83f25e01c250938b5c9f638237aab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62a0eec7b83f25e01c250938… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:56:48 2009 +0100 dmscript: Remove superfluous pointer casts. --- dlls/dmscript/dmscript_main.c | 20 ++++++++++---------- dlls/dmscript/script.c | 10 +++++----- dlls/dmscript/scripttrack.c | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index ae1cdbc..bbecb7b 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -582,43 +582,43 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSegment) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplSegment_CF; + *ppv = &ScriptAutoImplSegment_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptTrack_CF; + *ppv = &ScriptTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_AudioVBScript) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &AudioVBScript_CF; + *ppv = &AudioVBScript_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScript) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Script_CF; + *ppv = &Script_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpPerformance) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplPerformance_CF; + *ppv = &ScriptAutoImplPerformance_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptSourceCodeLoader) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptSourceCodeLoader_CF; + *ppv = &ScriptSourceCodeLoader_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSegmentState) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplSegmentState_CF; + *ppv = &ScriptAutoImplSegmentState_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpAudioPathConfig) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplAudioPathConfig_CF; + *ppv = &ScriptAutoImplAudioPathConfig_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpAudioPath) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplAudioPath_CF; + *ppv = &ScriptAutoImplAudioPath_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSong) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplSong_CF; + *ppv = &ScriptAutoImplSong_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 3d9ae42..d7c696b 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -45,19 +45,19 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { - *ppobj = (LPVOID)&This->ScriptVtbl; + *ppobj = &This->ScriptVtbl; IDirectMusicScriptImpl_IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IDirectMusicScriptImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicScriptImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } @@ -524,7 +524,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREA IDirectMusicObject* pObject = NULL; DMUS_OBJECTDESC desc; - ZeroMemory ((LPVOID)&desc, sizeof(DMUS_OBJECTDESC)); + ZeroMemory (&desc, sizeof(DMUS_OBJECTDESC)); desc.dwSize = sizeof(DMUS_OBJECTDESC); desc.dwValidData = DMUS_OBJ_STREAM | DMUS_OBJ_CLASS; desc.guidClass = CLSID_DirectMusicContainer; diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 4c3aca8..7ff8ef8 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN IDirectMusicScriptTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicScriptTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }

1 0

Michael Stefaniuc : rsaenh: Remove superfluous pointer casts.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 16042cff7b311c3317d7a56392b8be7587f2de24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16042cff7b311c3317d7a5639… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:56:04 2009 +0100 rsaenh: Remove superfluous pointer casts. --- dlls/rsaenh/rsaenh.c | 10 +++++----- dlls/rsaenh/tests/rsaenh.c | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 5467d64..94e54a1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2737,8 +2737,8 @@ BOOL WINAPI RSAENH_CPGetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa finalize_hash(pCryptHash); pCryptHash->dwState = RSAENH_HASHSTATE_FINISHED; } - - return copy_param(pbData, pdwDataLen, (CONST BYTE*)pCryptHash->abHashValue, + + return copy_param(pbData, pdwDataLen, pCryptHash->abHashValue, pCryptHash->dwHashSize); default: @@ -2950,13 +2950,13 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam switch (dwParam) { case KP_IV: - return copy_param(pbData, pdwDataLen, (CONST BYTE*)pCryptKey->abInitVector, + return copy_param(pbData, pdwDataLen, pCryptKey->abInitVector, pCryptKey->dwBlockLen); case KP_SALT: return copy_param(pbData, pdwDataLen, - (CONST BYTE*)&pCryptKey->abKeyValue[pCryptKey->dwKeyLen], pCryptKey->dwSaltLen); - + &pCryptKey->abKeyValue[pCryptKey->dwKeyLen], pCryptKey->dwSaltLen); + case KP_PADDING: dwValue = PKCS5_PADDING; return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index be3fa2c..60e8789 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -270,7 +270,7 @@ static BOOL derive_key(ALG_ID aiAlgid, HCRYPTKEY *phKey, DWORD len) } ok(result, "%08x\n", GetLastError()); if (!result) return FALSE; - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); if (!result) return FALSE; result = CryptDeriveKey(hProv, aiAlgid, hHash, (len << 16) | CRYPT_EXPORTABLE, phKey); @@ -315,7 +315,7 @@ static void test_hashes(void) /* rsaenh compiled without OpenSSL */ ok(GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); } else { - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -336,7 +336,7 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_MD4, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -360,7 +360,7 @@ static void test_hashes(void) result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashlen, &len, 0); ok(result && (hashlen == 16), "%08x, hashlen: %d\n", GetLastError(), hashlen); - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); len = 16; @@ -390,7 +390,7 @@ static void test_hashes(void) /* Can't add data after the hash been retrieved */ SetLastError(0xdeadbeef); - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(!result, "Expected failure\n"); ok(GetLastError() == NTE_BAD_HASH_STATE || GetLastError() == NTE_BAD_ALGID, /* Win9x, WinMe, NT4 */ @@ -409,7 +409,7 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, (BYTE*)pbData, 5, 0); + result = CryptHashData(hHash, pbData, 5, 0); ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) { @@ -766,7 +766,7 @@ static void test_rc2(void) } else { CRYPT_INTEGER_BLOB salt; - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); dwLen = 16; @@ -855,7 +855,7 @@ static void test_rc2(void) if (!result) { ok(GetLastError()==NTE_BAD_ALGID, "%08x\n", GetLastError()); } else { - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); dwLen = 16; @@ -935,7 +935,7 @@ static void test_rc4(void) } else { CRYPT_INTEGER_BLOB salt; - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); dwLen = 16; @@ -1027,7 +1027,7 @@ static void test_hmac(void) { result = CryptSetHashParam(hHash, HP_HMAC_INFO, (BYTE*)&hmacInfo, 0); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, (BYTE*)abData, sizeof(abData), 0); + result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08x\n", GetLastError()); dwLen = sizeof(abData)/sizeof(BYTE); @@ -1069,7 +1069,7 @@ static void test_mac(void) { ok(result, "%08x\n", GetLastError()); if (!result) return; - result = CryptHashData(hHash, (BYTE*)abData, sizeof(abData), 0); + result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08x\n", GetLastError()); dwLen = sizeof(abData)/sizeof(BYTE);

1 0

Michael Stefaniuc : dmloader: Remove superfluous pointer casts.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 4b50a4c6703dcfd44eaa3e9b51644946e8b37c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b50a4c6703dcfd44eaa3e9b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:56:36 2009 +0100 dmloader: Remove superfluous pointer casts. --- dlls/dmloader/container.c | 6 +++--- dlls/dmloader/loaderstream.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 09e9b0d..081fcce 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -81,15 +81,15 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_QueryInter TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDirectMusicContainer)) { - *ppobj = (LPVOID)&This->ContainerVtbl; + *ppobj = &This->ContainerVtbl; IDirectMusicContainerImpl_IDirectMusicContainer_AddRef ((LPDIRECTMUSICCONTAINER)&This->ContainerVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IDirectMusicContainerImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicContainerImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index da87403..b565292 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -96,11 +96,11 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_QueryInterface (LPSTR TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IStream)) { - *ppobj = (LPVOID)&This->StreamVtbl; + *ppobj = &This->StreamVtbl; IDirectMusicLoaderFileStream_IStream_AddRef ((LPSTREAM)&This->StreamVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicGetLoader)) { - *ppobj = (LPVOID)&This->GetLoaderVtbl; + *ppobj = &This->GetLoaderVtbl; IDirectMusicLoaderFileStream_IDirectMusicGetLoader_AddRef ((LPDIRECTMUSICGETLOADER)&This->GetLoaderVtbl); return S_OK; } @@ -344,11 +344,11 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_QueryInterface (L TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IStream)) { - *ppobj = (LPVOID)&This->StreamVtbl; + *ppobj = &This->StreamVtbl; IDirectMusicLoaderResourceStream_IStream_AddRef ((LPSTREAM)&This->StreamVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicGetLoader)) { - *ppobj = (LPVOID)&This->GetLoaderVtbl; + *ppobj = &This->GetLoaderVtbl; IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_AddRef ((LPDIRECTMUSICGETLOADER)&This->GetLoaderVtbl); return S_OK; } @@ -604,11 +604,11 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_QueryInterface (LP TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IStream)) { - *ppobj = (LPVOID)&This->StreamVtbl; + *ppobj = &This->StreamVtbl; IDirectMusicLoaderGenericStream_IStream_AddRef ((LPSTREAM)&This->StreamVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicGetLoader)) { - *ppobj = (LPVOID)&This->GetLoaderVtbl; + *ppobj = &This->GetLoaderVtbl; IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_AddRef ((LPDIRECTMUSICGETLOADER)&This->GetLoaderVtbl); return S_OK; }

1 0

Michael Stefaniuc : wldap32: Remove superfluous pointer casts.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: d576c2d9342e769c01fb99c0cc200a0bc4b9cded URL: http://source.winehq.org/git/wine.git/?a=commit;h=d576c2d9342e769c01fb99c0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:54:41 2009 +0100 wldap32: Remove superfluous pointer casts. --- dlls/wldap32/option.c | 4 ++-- dlls/wldap32/parse.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 713b3ca..801d77d 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -327,7 +327,7 @@ ULONG CDECL ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value ) { LDAPControlW **ctrlsW; - ctrlsW = controlarrayAtoW( (LDAPControlA **)value ); + ctrlsW = controlarrayAtoW( value ); if (!ctrlsW) return WLDAP32_LDAP_NO_MEMORY; ret = ldap_set_optionW( ld, option, ctrlsW ); @@ -430,7 +430,7 @@ ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value ) { LDAPControl **ctrlsU; - ctrlsU = controlarrayWtoU( (LDAPControlW **)value ); + ctrlsU = controlarrayWtoU( value ); if (!ctrlsU) return WLDAP32_LDAP_NO_MEMORY; ret = map_error( ldap_set_option( ld, option, ctrlsU )); diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 6439ba6..f7e93dd 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -444,7 +444,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, #ifdef HAVE_LDAP_PARSE_VLV_CONTROL if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, - (struct berval **)context, errcode ))) + context, errcode ))) { *targetpos = pos; *listcount = count;

1 0

Michael Stefaniuc : devenum: Remove superfluous pointer casts.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: f7c133284b803f036525cf789b48cb022da9340c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c133284b803f036525cf789… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:57:39 2009 +0100 devenum: Remove superfluous pointer casts. --- dlls/devenum/createdevenum.c | 2 +- dlls/devenum/devenum_main.c | 2 +- dlls/devenum/factory.c | 2 +- dlls/devenum/mediacatenum.c | 22 +++++++++++----------- dlls/devenum/parsedisplayname.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index e64b27b..3891dec 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -71,7 +71,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ICreateDevEnum)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; DEVENUM_ICreateDevEnum_AddRef(iface); return S_OK; } diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 0ab12e5..5c44b75 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -154,7 +154,7 @@ HRESULT WINAPI DllRegisterServer(void) static const WCHAR friendlyextrend[] = {'E','x','t','e','r','n','a','l',' ','R','e','n','d','e','r','e','r','s',0}; static const WCHAR friendlydevctrl[] = {'D','e','v','i','c','e',' ','C','o','n','t','r','o','l',' ','F','i','l','t','e','r','s',0}; - pMapper = (IFilterMapper2*)mapvptr; + pMapper = mapvptr; IFilterMapper2_CreateCategory(pMapper, &CLSID_VideoInputDeviceCategory, MERIT_DO_NOT_USE, friendlyvidcap); IFilterMapper2_CreateCategory(pMapper, &CLSID_LegacyAmFilterCategory, MERIT_NORMAL, friendlydshow); diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c index 1648e80..f169fd6 100644 --- a/dlls/devenum/factory.c +++ b/dlls/devenum/factory.c @@ -40,7 +40,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; IClassFactory_AddRef(iface); return S_OK; } diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 6c20524..946f750 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -56,7 +56,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IPropertyBag)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; DEVENUM_IPropertyBag_AddRef(iface); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( pData = HeapAlloc(GetProcessHeap(), 0, received); /* work around a GCC bug that occurs here unless we use the reswin32 variable as well */ - reswin32 = RegQueryValueExW(This->hkey, pszPropName, NULL, &type, (LPBYTE)pData, &received); + reswin32 = RegQueryValueExW(This->hkey, pszPropName, NULL, &type, pData, &received); res = HRESULT_FROM_WIN32(reswin32); } @@ -130,7 +130,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( { res = E_INVALIDARG; /* assume we cannot coerce into right type */ - TRACE("Read %d bytes (%s)\n", received, type == REG_SZ ? debugstr_w((LPWSTR)pData) : "binary data"); + TRACE("Read %d bytes (%s)\n", received, type == REG_SZ ? debugstr_w(pData) : "binary data"); switch (type) { @@ -139,14 +139,14 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( { case VT_LPWSTR: V_UNION(pVar, bstrVal) = CoTaskMemAlloc(received); - memcpy(V_UNION(pVar, bstrVal), (LPWSTR)pData, received); + memcpy(V_UNION(pVar, bstrVal), pData, received); res = S_OK; break; case VT_EMPTY: V_VT(pVar) = VT_BSTR; /* fall through */ case VT_BSTR: - V_UNION(pVar, bstrVal) = SysAllocStringLen((LPWSTR)pData, received/sizeof(WCHAR) - 1); + V_UNION(pVar, bstrVal) = SysAllocStringLen(pData, received/sizeof(WCHAR) - 1); res = S_OK; break; } @@ -224,14 +224,14 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( { case VT_BSTR: TRACE("writing %s\n", debugstr_w(V_UNION(pVar, bstrVal))); - lpData = (LPVOID)V_UNION(pVar, bstrVal); + lpData = V_UNION(pVar, bstrVal); dwType = REG_SZ; cbData = (lstrlenW(V_UNION(pVar, bstrVal)) + 1) * sizeof(WCHAR); break; case VT_I4: case VT_UI4: TRACE("writing %u\n", V_UNION(pVar, ulVal)); - lpData = (LPVOID)&V_UNION(pVar, ulVal); + lpData = &V_UNION(pVar, ulVal); dwType = REG_DWORD; cbData = sizeof(DWORD); break; @@ -303,7 +303,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_QueryInterface( IsEqualGUID(riid, &IID_IPersistStream) || IsEqualGUID(riid, &IID_IMoniker)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; DEVENUM_IMediaCatMoniker_AddRef(iface); return S_OK; } @@ -412,7 +412,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject( /* first activation of this class */ LPVOID pvptr; res=IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, &pvptr); - pProp = (IPropertyBag*)pvptr; + pProp = pvptr; if (SUCCEEDED(res)) { V_VT(&var) = VT_LPWSTR; @@ -426,7 +426,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject( if (SUCCEEDED(res)) { res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IUnknown,&pvptr); - pObj = (IUnknown*)pvptr; + pObj = pvptr; } } @@ -718,7 +718,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumMoniker)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; DEVENUM_IEnumMoniker_AddRef(iface); return S_OK; } diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 4025215..2e41983 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -39,7 +39,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; IParseDisplayName_AddRef(iface); return S_OK; }

1 0

Michael Stefaniuc : wsock32: Remove superfluous pointer casts.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: b5e905a6226415e2dfca525cf9c0b1c485eb60aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e905a6226415e2dfca525cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:54:33 2009 +0100 wsock32: Remove superfluous pointer casts. --- dlls/wsock32/socket.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index 6073a76..74df2e3 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -108,7 +108,7 @@ DWORD WINAPI WsControl(DWORD protocol, /* Get the command structure into a pointer we can use, rather than void */ - TDIObjectID *pcommand = (TDIObjectID *)pRequestInfo; + TDIObjectID *pcommand = pRequestInfo; /* validate input parameters. Error codes are from winerror.h, not from * winsock.h. pcbResponseInfoLen is apparently allowed to be NULL for some @@ -149,7 +149,7 @@ DWORD WINAPI WsControl(DWORD protocol, */ case ENTITY_LIST_ID: { - TDIEntityID *baseptr = (TDIEntityID *)pResponseInfo; + TDIEntityID *baseptr = pResponseInfo; DWORD numInt, i, ifTable, spaceNeeded; PMIB_IFTABLE table; @@ -280,7 +280,7 @@ DWORD WINAPI WsControl(DWORD protocol, { PMIB_IPNETTABLE table; DWORD size; - PULONG output = (PULONG)pResponseInfo; + PULONG output = pResponseInfo; if (!pcbResponseInfoLen) return ERROR_BAD_ENVIRONMENT; @@ -323,7 +323,7 @@ DWORD WINAPI WsControl(DWORD protocol, return ERROR_BAD_ENVIRONMENT; if (*pcbResponseInfoLen < sizeof(MIB_IPSTATS)) return ERROR_LOCK_VIOLATION; - GetIpStatistics((PMIB_IPSTATS)pResponseInfo); + GetIpStatistics(pResponseInfo); *pcbResponseInfoLen = sizeof(MIB_IPSTATS); } @@ -346,7 +346,7 @@ DWORD WINAPI WsControl(DWORD protocol, return ERROR_BAD_ENVIRONMENT; if (*pcbResponseInfoLen < sizeof(MIB_UDPSTATS)) return ERROR_LOCK_VIOLATION; - GetUdpStatistics((PMIB_UDPSTATS)pResponseInfo); + GetUdpStatistics(pResponseInfo); *pcbResponseInfoLen = sizeof(MIB_UDPSTATS); } break; @@ -368,7 +368,7 @@ DWORD WINAPI WsControl(DWORD protocol, return ERROR_BAD_ENVIRONMENT; if (*pcbResponseInfoLen < sizeof(MIB_TCPSTATS)) return ERROR_LOCK_VIOLATION; - GetTcpStatistics((PMIB_TCPSTATS)pResponseInfo); + GetTcpStatistics(pResponseInfo); *pcbResponseInfoLen = sizeof(MIB_TCPSTATS); } break; @@ -386,7 +386,7 @@ DWORD WINAPI WsControl(DWORD protocol, case IP_MIB_ADDRTABLE_ENTRY_ID: { DWORD index = pcommand->toi_entity.tei_instance; - PMIB_IPADDRROW baseIPInfo = (PMIB_IPADDRROW) pResponseInfo; + PMIB_IPADDRROW baseIPInfo = pResponseInfo; PMIB_IPADDRTABLE table; DWORD tableSize, i; @@ -437,7 +437,7 @@ DWORD WINAPI WsControl(DWORD protocol, { DWORD routeTableSize, numRoutes, ndx, ret; PMIB_IPFORWARDTABLE table; - IPRouteEntry *winRouteTable = (IPRouteEntry *) pResponseInfo; + IPRouteEntry *winRouteTable = pResponseInfo; if (!pcbResponseInfoLen) return ERROR_BAD_ENVIRONMENT;

1 0

Henri Verbeet : wined3d: Fix cube texture creation error handling.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: a37782595f7c21b6eb7ee0c88d754ba0bdb2ced1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37782595f7c21b6eb7ee0c88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 13 10:31:58 2009 +0100 wined3d: Fix cube texture creation error handling. --- dlls/wined3d/device.c | 62 ++++++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7243fb0..d485ded 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1174,6 +1174,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface return WINED3DERR_INVALIDCALL; } + /* Calculate levels for mip mapping */ + if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) + { + if (!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) + { + WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + if (Levels > 1) + { + WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + Levels = 1; + } + else if (!Levels) + { + Levels = wined3d_log2i(EdgeLength) + 1; + TRACE("Calculated levels = %d\n", Levels); + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1226,28 +1249,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface object->baseTexture.magLookup = magLookup_noFilter; } - /* Calculate levels for mip mapping */ - if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { - if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { - WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); - HeapFree(GetProcessHeap(), 0, object); - *ppCubeTexture = NULL; - - return WINED3DERR_INVALIDCALL; - } - if(Levels > 1) { - WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); - HeapFree(GetProcessHeap(), 0, object); - *ppCubeTexture = NULL; - - return WINED3DERR_INVALIDCALL; - } - object->baseTexture.levels = 1; - } else if (Levels == 0) { - object->baseTexture.levels = wined3d_log2i(EdgeLength) + 1; - TRACE("Calculated levels = %d\n", object->baseTexture.levels); - } - /* Generate all the surfaces */ tmpW = EdgeLength; for (i = 0; i < object->baseTexture.levels; i++) { @@ -1266,21 +1267,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface hr=D3DCB_CreateSurface(This->parent, parent, tmpW, tmpW, Format, Usage, Pool, i /* Level */, j, &object->surfaces[j][i],pSharedHandle); - if(hr!= WINED3D_OK) { - /* clean up */ - unsigned int k; - unsigned int l; - for (l = 0; l < j; l++) { - IWineD3DSurface_Release(object->surfaces[l][i]); - } - for (k = 0; k < i; k++) { - for (l = 0; l < 6; l++) { - IWineD3DSurface_Release(object->surfaces[l][k]); - } - } - + if (FAILED(hr)) + { FIXME("(%p) Failed to create surface\n",object); - HeapFree(GetProcessHeap(),0,object); + IWineD3DCubeTexture_Release((IWineD3DCubeTexture *)object); *ppCubeTexture = NULL; return hr; }

1 0

Henri Verbeet : wined3d: Fix volume texture creation error handling.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: d030cbdad2a746232bae82c63ee6d2482a8505ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d030cbdad2a746232bae82c63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 13 10:31:57 2009 +0100 wined3d: Fix volume texture creation error handling. --- dlls/wined3d/device.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2b10c2b..7243fb0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -989,6 +989,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa return WINED3DERR_INVALIDCALL; } + /* Calculate levels for mip mapping */ + if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) + { + if (!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) + { + WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + if (Levels > 1) + { + WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + Levels = 1; + } + else if (!Levels) + { + Levels = wined3d_log2i(max(max(Width, Height), Depth)) + 1; + TRACE("Calculated levels = %d\n", Levels); + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1030,22 +1053,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa object->baseTexture.magLookup = magLookup_noFilter; } - /* Calculate levels for mip mapping */ - if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { - if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { - WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - if(Levels > 1) { - WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - object->baseTexture.levels = 1; - } else if (Levels == 0) { - object->baseTexture.levels = wined3d_log2i(max(max(Width, Height), Depth)) + 1; - TRACE("Calculated levels = %d\n", object->baseTexture.levels); - } - /* Generate all the surfaces */ tmpW = Width; tmpH = Height;

1 0

Henri Verbeet : wined3d: Fix surface creation error handling.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 99d3c62163f06e9715706d2cbfde9871dab1d779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d3c62163f06e9715706d2cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 13 10:31:57 2009 +0100 wined3d: Fix surface creation error handling. --- dlls/wined3d/device.c | 59 ++++++++++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8594cb7..2b10c2b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -662,7 +662,31 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U return WINED3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &IWineD3DSurface_Vtbl; + /* Look at the implementation and set the correct Vtable */ + switch(Impl) + { + case SURFACE_OPENGL: + /* Check if a 3D adapter is available when creating gl surfaces */ + if (!This->adapter) + { + ERR("OpenGL surfaces are not available without opengl\n"); + HeapFree(GetProcessHeap(), 0, object); + return WINED3DERR_NOTAVAILABLE; + } + object->lpVtbl = &IWineD3DSurface_Vtbl; + break; + + case SURFACE_GDI: + object->lpVtbl = &IWineGDISurface_Vtbl; + break; + + default: + /* To be sure to catch this */ + ERR("Unknown requested surface implementation %d!\n", Impl); + HeapFree(GetProcessHeap(), 0, object); + return WINED3DERR_INVALIDCALL; + } + hr = resource_init(&object->resource, WINED3DRTYPE_SURFACE, This, Size, Usage, Format, Pool, parent); if (FAILED(hr)) { @@ -745,34 +769,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U This, Width, Height, Format, debug_d3dformat(Format), (WINED3DFMT_D16_LOCKABLE == Format), *ppSurface, object->resource.allocatedMemory, object->resource.size); - /* Look at the implementation and set the correct Vtable */ - switch(Impl) { - case SURFACE_OPENGL: - /* Check if a 3D adapter is available when creating gl surfaces */ - if(!This->adapter) { - ERR("OpenGL surfaces are not available without opengl\n"); - HeapFree(GetProcessHeap(), 0, object->resource.allocatedMemory); - HeapFree(GetProcessHeap(), 0, object); - return WINED3DERR_NOTAVAILABLE; - } - break; - - case SURFACE_GDI: - object->lpVtbl = &IWineGDISurface_Vtbl; - break; - - default: - /* To be sure to catch this */ - ERR("Unknown requested surface implementation %d!\n", Impl); - IWineD3DSurface_Release((IWineD3DSurface *) object); - return WINED3DERR_INVALIDCALL; - } - list_init(&object->renderbuffers); /* Call the private setup routine */ - return IWineD3DSurface_PrivateSetup( (IWineD3DSurface *) object ); + hr = IWineD3DSurface_PrivateSetup((IWineD3DSurface *)object); + if (FAILED(hr)) + { + ERR("Private setup failed, returning %#x\n", hr); + IWineD3DSurface_Release(*ppSurface); + *ppSurface = NULL; + return hr; + } + return hr; } static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, UINT Width, UINT Height, UINT Levels,

1 0

Henri Verbeet : wined3d: Fix texture creation error handling.
by Alexandre Julliard 13 Jan '09

13 Jan '09

Module: wine Branch: master Commit: 2654a148deffa2d09107682474f79984463cd65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2654a148deffa2d0910768247… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 13 10:31:57 2009 +0100 wined3d: Fix texture creation error handling. Doing the levels calculation before the object is created prevents leaking resources and avoids changing baseTexture.levels after it's been initialized by basetexture_init(). --- dlls/wined3d/device.c | 85 +++++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6717fd8..8594cb7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -802,6 +802,53 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U return WINED3DERR_INVALIDCALL; } + /* Non-power2 support */ + if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) + { + pow2Width = Width; + pow2Height = Height; + } + else + { + /* Find the nearest pow2 match */ + pow2Width = pow2Height = 1; + while (pow2Width < Width) pow2Width <<= 1; + while (pow2Height < Height) pow2Height <<= 1; + + if (pow2Width != Width || pow2Height != Height) + { + if (Levels > 1) + { + WARN("Attempted to create a mipmapped np2 texture without unconditional np2 support\n"); + return WINED3DERR_INVALIDCALL; + } + Levels = 1; + } + } + + /* Calculate levels for mip mapping */ + if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) + { + if (!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) + { + WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + if (Levels > 1) + { + WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + Levels = 1; + } + else if (!Levels) + { + Levels = wined3d_log2i(max(Width, Height)) + 1; + TRACE("Calculated levels = %d\n", Levels); + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -838,28 +885,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U object->baseTexture.magLookup = magLookup_noFilter; } - /** Non-power2 support **/ - if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { - pow2Width = Width; - pow2Height = Height; - } else { - /* Find the nearest pow2 match */ - pow2Width = pow2Height = 1; - while (pow2Width < Width) pow2Width <<= 1; - while (pow2Height < Height) pow2Height <<= 1; - - if(pow2Width != Width || pow2Height != Height) { - if(Levels > 1) { - WARN("Attempted to create a mipmapped np2 texture without unconditional np2 support\n"); - HeapFree(GetProcessHeap(), 0, object); - *ppTexture = NULL; - return WINED3DERR_INVALIDCALL; - } else { - Levels = 1; - } - } - } - /** FIXME: add support for real non-power-two if it's provided by the video card **/ /* Precalculated scaling for 'faked' non power of two texture coords. Second also don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE @@ -895,22 +920,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U } TRACE(" xf(%f) yf(%f)\n", object->baseTexture.pow2Matrix[0], object->baseTexture.pow2Matrix[5]); - /* Calculate levels for mip mapping */ - if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { - if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { - WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - if(Levels > 1) { - WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - object->baseTexture.levels = 1; - } else if (Levels == 0) { - object->baseTexture.levels = wined3d_log2i(max(Width, Height)) + 1; - TRACE("Calculated levels = %d\n", object->baseTexture.levels); - } - /* Generate all the surfaces */ tmpW = Width; tmpH = Height;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2009