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

Alexandre Julliard : configure: Add .cfi_startproc/ endproc directives to assembly functions if supported.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: ccea0ae9e2fb4a73da542c05222705adf301513a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccea0ae9e2fb4a73da542c052… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 11 19:46:19 2009 +0200 configure: Add .cfi_startproc/endproc directives to assembly functions if supported. --- configure | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 10 ++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 90b82a7..3130f70 100755 --- a/configure +++ b/configure @@ -17865,12 +17865,69 @@ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_c_dot_previous" >&5 $as_echo "$ac_cv_c_dot_previous" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether CFI directives are supported in assembly code" >&5 +$as_echo_n "checking whether CFI directives are supported in assembly code... " >&6; } +if test "${ac_cv_c_cfi_support+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc"); +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_cfi_support="yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_cfi_support="no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_cfi_support" >&5 +$as_echo "$ac_cv_c_cfi_support" >&6; } + asm_func_header=".globl $asm_name_prefix\" #name \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name \":\\n\\t" asm_func_trailer="" if test "$ac_cv_c_dot_previous" = "yes" then asm_func_trailer="\\n\\t.previous" fi +if test "$ac_cv_c_cfi_support" = "yes" +then + asm_func_header="$asm_func_header.cfi_startproc\\n\\t" + asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" +fi + asm_func_code="$asm_func_header\" code \"$asm_func_trailer" diff --git a/configure.ac b/configure.ac index 4f74d71..4b89c19 100644 --- a/configure.ac +++ b/configure.ac @@ -1438,12 +1438,22 @@ AC_CACHE_CHECK([whether .previous is supported in assembly code], ac_cv_c_dot_pr WINE_TRY_ASM_LINK([".text\nac_test:\t.long 0\n\t.previous"],,, ac_cv_c_dot_previous="yes",ac_cv_c_dot_previous="no")) +AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_cfi_support, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc");]])], + ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no")) + asm_func_header=".globl $asm_name_prefix\" #name \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name \":\\n\\t" asm_func_trailer="" if test "$ac_cv_c_dot_previous" = "yes" then asm_func_trailer="\\n\\t.previous" fi +if test "$ac_cv_c_cfi_support" = "yes" +then + asm_func_header="$asm_func_header.cfi_startproc\\n\\t" + asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" +fi + asm_func_code="$asm_func_header\" code \"$asm_func_trailer" AH_TEMPLATE(__ASM_GLOBAL_FUNC,[Define to a macro to generate an assembly function])

1 0

Damjan Jovanovic : wine.inf: Update file type associations on startup.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: bd623c2b795af214ee0fc72b4b8ea0f819c9368e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd623c2b795af214ee0fc72b4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 11 20:50:42 2009 +0200 wine.inf: Update file type associations on startup. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5464213..8fe4161 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -403,6 +403,7 @@ HKLM,%CurrentVersion%,"RegisteredOwner",2,"" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" +HKLM,%CurrentVersion%\Run,"winemenubuilder",2,"winemenubuilder -a" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Uninstall,,,""

1 0

Damjan Jovanovic : shell32: Update file type associations when requested.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: f612ed1fcbdf67830f5598dbb08c627a92a46ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f612ed1fcbdf67830f5598dbb… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 11 20:52:03 2009 +0200 shell32: Update file type associations when requested. --- dlls/shell32/changenotify.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 96345b6..43a5fb8 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -105,6 +105,31 @@ static const char * DumpEvent( LONG event ) #undef DUMPEV } +static BOOL RefreshFileTypeAssociations(void) +{ + static WCHAR szWinemenubuilder[] = { + 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', + ' ','-','a',0 }; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + BOOL ret; + + TRACE("starting %s\n",debugstr_w(szWinemenubuilder)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + + ret = CreateProcessW( NULL, szWinemenubuilder, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + + if (ret) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + + return ret; +} + static const char * NodeName(const NOTIFICATIONLIST *item) { const char *str; @@ -397,6 +422,12 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID } TRACE("notify Done\n"); LeaveCriticalSection(&SHELL32_ChangenotifyCS); + + if (wEventId & SHCNE_ASSOCCHANGED) + { + TRACE("refreshing file type associations\n"); + RefreshFileTypeAssociations(); + } /* if we allocated it, free it. The ANSI flag is also set in its Unicode sibling. */ if ((typeFlag & SHCNF_PATHA) || (typeFlag & SHCNF_PRINTERA))

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 5a981c3a64d415d604421ad3d9978e988255ebd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a981c3a64d415d604421ad3d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 11 22:10:39 2009 +0100 crypt32: Constify some variables. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/chain.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2780cba..2b43d3e 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2419,7 +2419,7 @@ static void CRYPT_SetBitInField(struct BitField *field, DWORD bit) field->indexes[indexIndex] |= 1 << (bit % BITS_PER_DWORD); } -static BOOL CRYPT_IsBitInFieldSet(struct BitField *field, DWORD bit) +static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit) { BOOL set = FALSE; DWORD indexIndex = bit / BITS_PER_DWORD; diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 2e414cd..b22cb5b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -262,7 +262,7 @@ static void CRYPT_CheckSimpleChainForCycles(PCERT_SIMPLE_CHAIN chain) } /* Checks whether the chain is cyclic by examining the last element's status */ -static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain) +static inline BOOL CRYPT_IsSimpleChainCyclic(const CERT_SIMPLE_CHAIN *chain) { if (chain->cElement) return chain->rgpElement[chain->cElement - 1]->TrustStatus.dwErrorStatus @@ -272,7 +272,7 @@ static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain) } static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus, - CERT_TRUST_STATUS *elementStatus) + const CERT_TRUST_STATUS *elementStatus) { /* Any error that applies to an element also applies to a chain.. */ chainStatus->dwErrorStatus |= elementStatus->dwErrorStatus; @@ -282,7 +282,7 @@ static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus, chainStatus->dwInfoStatus |= (elementStatus->dwInfoStatus & 0xfffffff0); } -static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, +static BOOL CRYPT_AddCertToSimpleChain(const CertificateChainEngine *engine, PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD subjectInfoStatus) { BOOL ret = FALSE; @@ -720,7 +720,7 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) } } -static void dump_basic_constraints(PCERT_EXTENSION ext) +static void dump_basic_constraints(const CERT_EXTENSION *ext) { CERT_BASIC_CONSTRAINTS_INFO *info; DWORD size = 0; @@ -737,7 +737,7 @@ static void dump_basic_constraints(PCERT_EXTENSION ext) } } -static void dump_basic_constraints2(PCERT_EXTENSION ext) +static void dump_basic_constraints2(const CERT_EXTENSION *ext) { CERT_BASIC_CONSTRAINTS2_INFO constraints; DWORD size = sizeof(CERT_BASIC_CONSTRAINTS2_INFO); @@ -754,7 +754,7 @@ static void dump_basic_constraints2(PCERT_EXTENSION ext) } } -static void dump_extension(PCERT_EXTENSION ext) +static void dump_extension(const CERT_EXTENSION *ext) { TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId), ext->fCritical ? "" : "not "); @@ -1008,7 +1008,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, /* Builds a simple chain by finding an issuer for the last cert in the chain, * until reaching a self-signed cert, or until no issuer can be found. */ -static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, +static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, HCERTSTORE world, PCERT_SIMPLE_CHAIN chain) { BOOL ret = TRUE; @@ -1116,7 +1116,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, /* Makes and returns a copy of chain, up to and including element iElement. */ static PCERT_SIMPLE_CHAIN CRYPT_CopySimpleChainToElement( - PCERT_SIMPLE_CHAIN chain, DWORD iElement) + const CERT_SIMPLE_CHAIN *chain, DWORD iElement) { PCERT_SIMPLE_CHAIN copy = CryptMemAlloc(sizeof(CERT_SIMPLE_CHAIN)); @@ -1345,7 +1345,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( #define IS_TRUST_ERROR_SET(TrustStatus, bits) \ (TrustStatus)->dwErrorStatus & (bits) -static DWORD CRYPT_ChainQuality(PCertificateChain chain) +static DWORD CRYPT_ChainQuality(const CertificateChain *chain) { DWORD quality = CHAIN_QUALITY_HIGHEST; @@ -1402,7 +1402,7 @@ static PCertificateChain CRYPT_ChooseHighestQualityChain( } static BOOL CRYPT_AddAlternateChainToChain(PCertificateChain chain, - PCertificateChain alternate) + const CertificateChain *alternate) { BOOL ret; @@ -1427,7 +1427,7 @@ static BOOL CRYPT_AddAlternateChainToChain(PCertificateChain chain, } static PCERT_CHAIN_ELEMENT CRYPT_FindIthElementInChain( - PCERT_CHAIN_CONTEXT chain, DWORD i) + const CERT_CHAIN_CONTEXT *chain, DWORD i) { DWORD j, iElement; PCERT_CHAIN_ELEMENT element = NULL; @@ -1448,7 +1448,7 @@ typedef struct _CERT_CHAIN_PARA_NO_EXTRA_FIELDS { } CERT_CHAIN_PARA_NO_EXTRA_FIELDS, *PCERT_CHAIN_PARA_NO_EXTRA_FIELDS; static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, - LPFILETIME pTime, PCERT_CHAIN_PARA pChainPara, DWORD chainFlags) + LPFILETIME pTime, const CERT_CHAIN_PARA *pChainPara, DWORD chainFlags) { DWORD cContext;

1 0

Juan Lang : wintrust: Only check the pgKnownSubject member if the struct includes it.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 9ae0f7a191a722bdc6bd28a3474db4321112d1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae0f7a191a722bdc6bd28a34… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 11 14:34:58 2009 -0700 wintrust: Only check the pgKnownSubject member if the struct includes it. --- dlls/wintrust/softpub.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 9a78838..e59c31f 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -90,7 +90,9 @@ static BOOL SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data) { BOOL ret; - if (!data->pWintrustData->u.pFile->pgKnownSubject) + if (!WVT_ISINSTRUCT(WINTRUST_FILE_INFO, + data->pWintrustData->u.pFile->cbStruct, pgKnownSubject) || + !data->pWintrustData->u.pFile->pgKnownSubject) { ret = CryptSIPRetrieveSubjectGuid( data->pWintrustData->u.pFile->pcwszFilePath,

1 0

Jacek Caban : urlmon: Fixed test on IE8.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 35798002f8086c50ded6c95e31253c95de86f136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35798002f8086c50ded6c95e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 01:08:25 2009 +0200 urlmon: Fixed test on IE8. --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/tests/url.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 044b817..8c1949b 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -386,7 +386,7 @@ static HRESULT WINAPI BSCHttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); if(!This->http_negotiate2) - return E_FAIL; + return E_NOTIMPL; return IHttpNegotiate2_GetRootSecurityId(This->http_negotiate2, pbSecurityId, pcbSecurityId, dwReserved); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7b9c89f..c3815d6 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1963,7 +1963,7 @@ static BOOL test_bscholder(IBindStatusCallback *holder) if(SUCCEEDED(hres)) { have_IHttpNegotiate2 = TRUE; hres = IHttpNegotiate2_GetRootSecurityId(http_negotiate2, (void*)0xdeadbeef, (void*)0xdeadbeef, 0); - ok(hres == E_FAIL, "GetRootSecurityId failed: %08x\n", hres); + ok(hres == E_FAIL || hres == E_NOTIMPL, "GetRootSecurityId failed: %08x\n", hres); SET_EXPECT(QueryInterface_IHttpNegotiate2); hres = IServiceProvider_QueryService(serv_prov, &IID_IHttpNegotiate2, &IID_IHttpNegotiate2,

1 0

Henri Verbeet : wined3d: Use the compressed format info in IWineD3DBaseSurfaceImpl_LockRect().
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 71e12ae936c61ac89d043f46410768e3cd9f4af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e12ae936c61ac89d043f464… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 12 09:46:03 2009 +0200 wined3d: Use the compressed format info in IWineD3DBaseSurfaceImpl_LockRect(). --- dlls/wined3d/surface_base.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 2120d19..ad446de 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1821,32 +1821,24 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL } else { + const struct GlPixelFormatDesc *format_desc = This->resource.format_desc; + TRACE("Lock Rect (%p) = l %d, t %d, r %d, b %d\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); - /* DXTn textures are based on compressed blocks of 4x4 pixels, each - * 16 bytes large (8 bytes in case of DXT1). Because of that Pitch has - * slightly different meaning compared to regular textures. For DXTn - * textures Pitch is the size of a row of blocks, 4 high and "width" - * long. The x offset is calculated differently as well, since moving 4 - * pixels to the right actually moves an entire 4x4 block to right, ie - * 16 bytes (8 in case of DXT1). */ - if (This->resource.format_desc->format == WINED3DFMT_DXT1) - { - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 2); - } - else if (This->resource.format_desc->format == WINED3DFMT_DXT2 - || This->resource.format_desc->format == WINED3DFMT_DXT3 - || This->resource.format_desc->format == WINED3DFMT_DXT4 - || This->resource.format_desc->format == WINED3DFMT_DXT5) + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) { - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 4); + /* Compressed textures are block based, so calculate the offset of + * the block that contains the top-left pixel of the locked rectangle. */ + pLockedRect->pBits = This->resource.allocatedMemory + + ((pRect->top / format_desc->block_height) * pLockedRect->Pitch) + + ((pRect->left / format_desc->block_width) * format_desc->block_byte_count); } else { pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + - (pRect->left * This->resource.format_desc->byte_count); + (pRect->left * format_desc->byte_count); } This->lockedRect.left = pRect->left; This->lockedRect.top = pRect->top;

1 0

Henri Verbeet : wined3d: Use WINED3DFMT_FLAG_COMPRESSED instead of checking for specific formats.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 8f67918f1d501363e1eb24b6a431874746440c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f67918f1d501363e1eb24b6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 12 09:46:03 2009 +0200 wined3d: Use WINED3DFMT_FLAG_COMPRESSED instead of checking for specific formats. --- dlls/wined3d/device.c | 8 ++------ dlls/wined3d/surface.c | 17 ++++------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 896f048..2032426 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5975,12 +5975,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, } else { /* Full width, so just write out the whole texture */ const unsigned char* data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; - if (WINED3DFMT_DXT1 == destFormat || - WINED3DFMT_DXT2 == destFormat || - WINED3DFMT_DXT3 == destFormat || - WINED3DFMT_DXT4 == destFormat || - WINED3DFMT_DXT5 == destFormat) { - + if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) { /* FIXME: The easy way to do this is to lock the destination, and copy the bits across. */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c81dab3..5cf28a1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -146,9 +146,7 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { ENTER_GL(); - if (format_desc->format == WINED3DFMT_DXT1 || format_desc->format == WINED3DFMT_DXT2 - || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 - || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", This, This->glDescription.level, format_desc->glFormat, format_desc->glType, @@ -294,9 +292,7 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi if (format_desc->heightscale != 1.0 && format_desc->heightscale != 0.0) height *= format_desc->heightscale; - if (format_desc->format == WINED3DFMT_DXT1 || format_desc->format == WINED3DFMT_DXT2 - || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 - || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) { /* glCompressedTexSubImage2D() for uploading and glTexImage2D() for * allocating does not work well on some drivers (r200 dri, MacOS ATI @@ -369,9 +365,7 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, This, This->glDescription.target, This->glDescription.level, debug_d3dformat(format_desc->format), internal, width, height, format, type); - if (format_desc->format == WINED3DFMT_DXT1 || format_desc->format == WINED3DFMT_DXT2 - || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 - || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) { /* glCompressedTexImage2D does not accept NULL pointers, so we cannot allocate a compressed texture without uploading data */ TRACE("Not allocating compressed surfaces, surface_upload_data will specify them\n"); @@ -3958,11 +3952,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->pow2Height = pow2Height; if (pow2Width > This->currentDesc.Width || pow2Height > This->currentDesc.Height) { - WINED3DFORMAT Format = This->resource.format_desc->format; /** TODO: add support for non power two compressed textures **/ - if (Format == WINED3DFMT_DXT1 || Format == WINED3DFMT_DXT2 || Format == WINED3DFMT_DXT3 - || Format == WINED3DFMT_DXT4 || Format == WINED3DFMT_DXT5 - || Format == WINED3DFMT_ATI2N) + if (This->resource.format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) { FIXME("(%p) Compressed non-power-two textures are not supported w(%d) h(%d)\n", This, This->currentDesc.Width, This->currentDesc.Height);

1 0

Henri Verbeet : wined3d: Remove the useless "resource_type" parameter from IWineD3DDevice::CreateSurface().
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 4bc6b376e048ee19facd97790ba337167fe348d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc6b376e048ee19facd97790… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 12 09:46:03 2009 +0200 wined3d: Remove the useless "resource_type" parameter from IWineD3DDevice::CreateSurface(). --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 28 +++++++++++++++++----------- dlls/d3d9/device.c | 30 ++++++++++++++++++------------ dlls/ddraw/ddraw.c | 8 ++++---- dlls/wined3d/device.c | 13 ++++++------- dlls/wined3d/surface_base.c | 7 +++---- include/wine/wined3d.idl | 1 - 7 files changed, 49 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bc6b376e048ee19facd9…

1 0

Henri Verbeet : wined3d: Respect the "srgb" parameter to IWineD3DSurfaceImpl_BindTexture().
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 669891c817ae359e01758b6f32e367835a940813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669891c817ae359e01758b6f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 12 09:46:04 2009 +0200 wined3d: Respect the "srgb" parameter to IWineD3DSurfaceImpl_BindTexture(). This is mostly for consistency, standalone surfaces can't be used for texturing, so in practice "srgb" should always be FALSE in this path. --- 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 5cf28a1..116cff0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2479,7 +2479,7 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL ERR("Mipmap surface has a glTexture bound to it!\n"); } - glBindTexture(This->glDescription.target, This->glDescription.textureName); + glBindTexture(This->glDescription.target, *name); checkGLcall("glBindTexture"); LEAVE_GL();

1 0