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

Henri Verbeet : wined3d: Correctly calculate the resource size for ATI2N surfaces.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 6a9476b6090d80fb25fbf2039422c4c7858e40fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9476b6090d80fb25fbf2039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:46 2010 +0200 wined3d: Correctly calculate the resource size for ATI2N surfaces. --- dlls/wined3d/surface_base.c | 6 ++++-- dlls/wined3d/utils.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 99857f3..e9e1ff7 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -327,7 +327,8 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) { DWORD ret; TRACE("(%p)\n", This); - if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + if ((format_desc->Flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BROKEN_PITCH)) + == WINED3DFMT_FLAG_COMPRESSED) { /* Since compressed formats are block based, pitch means the amount of * bytes to the next row of block rather than the next row of pixels. */ @@ -1860,7 +1861,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL TRACE("Lock Rect (%p) = l %d, t %d, r %d, b %d\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); - if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + if ((format_desc->Flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BROKEN_PITCH)) + == WINED3DFMT_FLAG_COMPRESSED) { /* Compressed textures are block based, so calculate the offset of * the block that contains the top-left pixel of the locked rectangle. */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 479f329..a4ea624 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -139,6 +139,9 @@ struct wined3d_format_base_flags DWORD flags; }; +/* The ATI2N format behaves like an uncompressed format in LockRect(), but + * still needs to use the correct block based calculation for e.g. the + * resource size. */ static const struct wined3d_format_base_flags format_base_flags[] = { {WINED3DFMT_UYVY, WINED3DFMT_FLAG_FOURCC}, @@ -163,7 +166,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_B4G4R4X4_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_R8G8B8X8_UNORM, WINED3DFMT_FLAG_GETDC}, - {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_FOURCC}, + {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_FOURCC | WINED3DFMT_FLAG_BROKEN_PITCH}, {WINED3DFMT_NVHU, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_NVHS, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_FLAG_FLOAT}, @@ -192,7 +195,7 @@ static const struct wined3d_format_compression_info format_compression_info[] = {WINED3DFMT_DXT3, 4, 4, 16}, {WINED3DFMT_DXT4, 4, 4, 16}, {WINED3DFMT_DXT5, 4, 4, 16}, - {WINED3DFMT_ATI2N, 1, 1, 1}, + {WINED3DFMT_ATI2N, 4, 4, 16}, }; struct wined3d_format_vertex_info diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 37c41da..330d92b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2942,6 +2942,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; #define WINED3DFMT_FLAG_VTF 0x00002000 #define WINED3DFMT_FLAG_SHADOW 0x00004000 #define WINED3DFMT_FLAG_COMPRESSED 0x00008000 +#define WINED3DFMT_FLAG_BROKEN_PITCH 0x00010000 struct wined3d_format_desc {

1 0

Henri Verbeet : wined3d: Rename surface_calculate_size() to wined3d_format_calculate_size().
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: d494dfb6c083295b033d5327df0bcc681b8c19a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d494dfb6c083295b033d5327d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:47 2010 +0200 wined3d: Rename surface_calculate_size() to wined3d_format_calculate_size(). --- dlls/wined3d/surface.c | 27 +-------------------------- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/utils.c | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index eff5a5e..9ea65ae 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -92,31 +92,6 @@ static void surface_cleanup(IWineD3DSurfaceImpl *This) resource_cleanup((IWineD3DResource *)This); } -UINT surface_calculate_size(const struct wined3d_format_desc *format_desc, UINT alignment, UINT width, UINT height) -{ - UINT size; - - if (format_desc->format == WINED3DFMT_UNKNOWN) - { - size = 0; - } - else if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { - UINT row_block_count = (width + format_desc->block_width - 1) / format_desc->block_width; - UINT row_count = (height + format_desc->block_height - 1) / format_desc->block_height; - size = row_count * row_block_count * format_desc->block_byte_count; - } - else - { - /* The pitch is a multiple of 4 bytes. */ - size = height * (((width * format_desc->byte_count) + alignment - 1) & ~(alignment - 1)); - } - - if (format_desc->heightscale != 0.0f) size *= format_desc->heightscale; - - return size; -} - struct blt_info { GLenum binding; @@ -356,7 +331,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, /* FIXME: Check that the format is supported by the device. */ - resource_size = surface_calculate_size(format_desc, alignment, width, height); + resource_size = wined3d_format_calculate_size(format_desc, alignment, width, height); /* Look at the implementation and set the correct Vtable. */ switch (surface_type) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index e9e1ff7..6c12155 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -511,7 +511,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3D TRACE("(%p) : Setting texture format to (%d,%s)\n", This, format, debug_d3dformat(format)); - This->resource.size = surface_calculate_size(format_desc, This->resource.device->surface_alignment, + This->resource.size = wined3d_format_calculate_size(format_desc, This->resource.device->surface_alignment, This->pow2Width, This->pow2Height); This->Flags |= (WINED3DFMT_D16_LOCKABLE == format) ? SFLAG_LOCKABLE : 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a4ea624..8396513 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1550,6 +1550,30 @@ const struct wined3d_format_desc *getFormatDescEntry(WINED3DFORMAT fmt, const st return &gl_info->gl_formats[idx]; } +UINT wined3d_format_calculate_size(const struct wined3d_format_desc *format, UINT alignment, UINT width, UINT height) +{ + UINT size; + + if (format->format == WINED3DFMT_UNKNOWN) + { + size = 0; + } + else if (format->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + UINT row_block_count = (width + format->block_width - 1) / format->block_width; + UINT row_count = (height + format->block_height - 1) / format->block_height; + size = row_count * (((row_block_count * format->block_byte_count) + alignment - 1) & ~(alignment - 1)); + } + else + { + size = height * (((width * format->byte_count) + alignment - 1) & ~(alignment - 1)); + } + + if (format->heightscale != 0.0f) size *= format->heightscale; + + return size; +} + /***************************************************************************** * Trace formatting of useful values */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 330d92b..e21685e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2068,8 +2068,6 @@ extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl DECLSPEC_HIDDEN; extern const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl DECLSPEC_HIDDEN; void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; -UINT surface_calculate_size(const struct wined3d_format_desc *format_desc, - UINT alignment, UINT width, UINT height) DECLSPEC_HIDDEN; void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment, @@ -2980,6 +2978,8 @@ struct wined3d_format_desc const struct wined3d_format_desc *getFormatDescEntry(WINED3DFORMAT fmt, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +UINT wined3d_format_calculate_size(const struct wined3d_format_desc *format, + UINT alignment, UINT width, UINT height) DECLSPEC_HIDDEN; static inline BOOL use_vs(IWineD3DStateBlockImpl *stateblock) {

1 0

Henri Verbeet : wined3d: Round up to complete compressed blocks in IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: b20df2a24c369951532dbcefbd80e7c4fb9607da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20df2a24c369951532dbcefb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:48 2010 +0200 wined3d: Round up to complete compressed blocks in IWineD3DDeviceImpl_UpdateSurface(). This is mostly an issue for surfaces with dimensions smaller than their format's block width/height. --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 81e63ff..b9948ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5304,9 +5304,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, if (dst_format->Flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_length = (update_w / src_format->block_width) * src_format->block_byte_count; - UINT row_count = update_h / src_format->block_height; - UINT src_pitch = IWineD3DSurface_GetPitch(src_surface); + UINT row_length = wined3d_format_calculate_size(src_format, 1, update_w, 1); + UINT row_count = (update_h + src_format->block_height - 1) / src_format->block_height; + UINT src_pitch = wined3d_format_calculate_size(src_format, 1, src_w, 1); if (src_rect) {

1 0

Henri Verbeet : wined3d: Fix a couple of typos.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: a16cf58494c877e1d5db95ea5cea272bd2a30c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16cf58494c877e1d5db95ea5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:49 2010 +0200 wined3d: Fix a couple of typos. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b9948ab..ff9bd00 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4567,7 +4567,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, for(i = 0 ; i < swapchains ; i ++) { IWineD3DDeviceImpl_GetSwapChain(iface, i, &swapChain); - TRACE("presentinng chain %d, %p\n", i, swapChain); + TRACE("Presenting chain %d, %p.\n", i, swapChain); IWineD3DSwapChain_Present(swapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); IWineD3DSwapChain_Release(swapChain); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9ea65ae..25e7b42 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4238,7 +4238,7 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers IWineD3DBaseTexture *texture; IWineD3DSurfaceImpl *overlay; - TRACE("surface %p, location %s, persitent %#x.\n", + TRACE("surface %p, location %s, persistent %#x.\n", surface, debug_surflocation(flag), persistent); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 761f5ca105096317bd4ded47fc952d3340585cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761f5ca105096317bd4ded47f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Aug 15 20:15:18 2010 +0100 crypt32: Constify some variables. --- dlls/crypt32/chain.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e951ef8..5c63224 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1343,7 +1343,7 @@ static CERT_POLICIES_INFO *CRYPT_GetPolicies(PCCERT_CONTEXT cert) return policies; } -static void CRYPT_CheckPolicies(CERT_POLICIES_INFO *policies, CERT_INFO *cert, +static void CRYPT_CheckPolicies(const CERT_POLICIES_INFO *policies, CERT_INFO *cert, DWORD *errorStatus) { DWORD i; @@ -3001,7 +3001,7 @@ static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, return TRUE; } -static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, +static BOOL match_dns_to_subject_alt_name(const CERT_EXTENSION *ext, LPCWSTR server_name) { BOOL matches = FALSE; @@ -3069,7 +3069,7 @@ static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, return matches; } -static BOOL find_matching_domain_component(CERT_NAME_INFO *name, +static BOOL find_matching_domain_component(const CERT_NAME_INFO *name, LPCWSTR component) { BOOL matches = FALSE; @@ -3080,7 +3080,7 @@ static BOOL find_matching_domain_component(CERT_NAME_INFO *name, if (!strcmp(szOID_DOMAIN_COMPONENT, name->rgRDN[i].rgRDNAttr[j].pszObjId)) { - PCERT_RDN_ATTR attr; + const CERT_RDN_ATTR *attr; attr = &name->rgRDN[i].rgRDNAttr[j]; /* Compare with memicmpW rather than strcmpiW in order to avoid @@ -3088,7 +3088,7 @@ static BOOL find_matching_domain_component(CERT_NAME_INFO *name, * must match one domain component attribute's entire string * value with a case-insensitive match. */ - matches = !memicmpW(component, (LPWSTR)attr->Value.pbData, + matches = !memicmpW(component, (LPCWSTR)attr->Value.pbData, attr->Value.cbData / sizeof(WCHAR)); } return matches; @@ -3149,7 +3149,7 @@ static BOOL match_domain_component(LPCWSTR allowed_component, DWORD allowed_len, return matches; } -static BOOL match_common_name(LPCWSTR server_name, PCERT_RDN_ATTR nameAttr) +static BOOL match_common_name(LPCWSTR server_name, const CERT_RDN_ATTR *nameAttr) { LPCWSTR allowed = (LPCWSTR)nameAttr->Value.pbData; LPCWSTR allowed_component = allowed;

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 28e1ec4467272163c8d71f8b21c49cc5262d43ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e1ec4467272163c8d71f8b2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Aug 15 20:15:26 2010 +0100 crypt32: Constify some variables. --- dlls/crypt32/collectionstore.c | 4 ++-- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/decode.c | 6 +++--- dlls/crypt32/encode.c | 20 ++++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 35941dd..6fe380c 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -134,7 +134,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, * Assumes the collection store's lock is held. */ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, - PWINE_STORE_LIST_ENTRY storeEntry, PCONTEXT_FUNCS contextFuncs, + PWINE_STORE_LIST_ENTRY storeEntry, const CONTEXT_FUNCS *contextFuncs, PCWINE_CONTEXT_INTERFACE contextInterface, void *pPrev, size_t contextSize) { void *ret, *child; @@ -165,7 +165,7 @@ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, /* We always want the same function pointers (from certs, crls) * in the next store, so use the same offset into the next store. */ - size_t offset = (LPBYTE)contextFuncs - (LPBYTE)storeEntry->store; + size_t offset = (const BYTE *)contextFuncs - (LPBYTE)storeEntry->store; PWINE_STORE_LIST_ENTRY storeNextEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry); PCONTEXT_FUNCS storeNextContexts = diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 8385bf5..36ee3e2 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -106,7 +106,7 @@ BOOL CRYPT_AsnDecodeCMSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, * If CRYPT_ENCODE_ALLOC_FLAG is set in dwFlags, *pbEncoded will be set to a * pointer to the newly allocated memory. */ -BOOL CRYPT_EncodeEnsureSpace(DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, +BOOL CRYPT_EncodeEnsureSpace(DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded, DWORD bytesNeeded); BOOL CRYPT_AsnDecodePKCSDigestedData(const BYTE *pbEncoded, DWORD cbEncoded, diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 655a5b2..a5602ac 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -205,7 +205,7 @@ static BOOL CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, DWORD *len) * pointer to the newly allocated memory. */ static BOOL CRYPT_DecodeEnsureSpace(DWORD dwFlags, - PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo, + const CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo, DWORD bytesNeeded) { BOOL ret = TRUE; @@ -232,7 +232,7 @@ static BOOL CRYPT_DecodeEnsureSpace(DWORD dwFlags, return ret; } -static void CRYPT_FreeSpace(PCRYPT_DECODE_PARA pDecodePara, LPVOID pv) +static void CRYPT_FreeSpace(const CRYPT_DECODE_PARA *pDecodePara, LPVOID pv) { if (pDecodePara && pDecodePara->pfnFree) pDecodePara->pfnFree(pv); @@ -611,7 +611,7 @@ struct AsnArrayItemSize */ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, - PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo, + const CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { BOOL ret = TRUE; diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index c58b0e6..3beab84 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -100,7 +100,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSAttributes(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded); -BOOL CRYPT_EncodeEnsureSpace(DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, +BOOL CRYPT_EncodeEnsureSpace(DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded, DWORD bytesNeeded) { BOOL ret = TRUE; @@ -910,7 +910,7 @@ BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, } static BOOL CRYPT_AsnEncodeStringCoerce(const CERT_NAME_VALUE *value, - BYTE tag, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + BYTE tag, DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = TRUE; @@ -939,7 +939,7 @@ static BOOL CRYPT_AsnEncodeStringCoerce(const CERT_NAME_VALUE *value, } static BOOL CRYPT_AsnEncodeBMPString(const CERT_NAME_VALUE *value, - DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = TRUE; @@ -979,7 +979,7 @@ static BOOL CRYPT_AsnEncodeBMPString(const CERT_NAME_VALUE *value, } static BOOL CRYPT_AsnEncodeUTF8String(const CERT_NAME_VALUE *value, - DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = TRUE; @@ -1940,7 +1940,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSContentInfo(DWORD dwCertEncodingType, } static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value, - BYTE tag, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + BYTE tag, DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = TRUE; @@ -1972,7 +1972,7 @@ static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value, return ret; } -static void CRYPT_FreeSpace(PCRYPT_ENCODE_PARA pEncodePara, LPVOID pv) +static void CRYPT_FreeSpace(const CRYPT_ENCODE_PARA *pEncodePara, LPVOID pv) { if (pEncodePara && pEncodePara->pfnFree) pEncodePara->pfnFree(pv); @@ -1981,7 +1981,7 @@ static void CRYPT_FreeSpace(PCRYPT_ENCODE_PARA pEncodePara, LPVOID pv) } static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, - DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = TRUE; @@ -2035,7 +2035,7 @@ static inline int isprintableW(WCHAR wc) } static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, - DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = TRUE; @@ -2082,7 +2082,7 @@ static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, } static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, - DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = TRUE; @@ -2129,7 +2129,7 @@ static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, } static BOOL CRYPT_AsnEncodeUniversalString(const CERT_NAME_VALUE *value, - DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD dwFlags, const CRYPT_ENCODE_PARA *pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = TRUE;

1 0

Michael Stefaniuc : ddraw: Use FAILED instead of NOT SUCCEEDED.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: f55e2374a0f6e5a5eb934d08a7c96e7b6be0707c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55e2374a0f6e5a5eb934d08a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Aug 15 22:27:14 2010 +0200 ddraw: Use FAILED instead of NOT SUCCEEDED. --- dlls/ddraw/ddraw.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 502cc84..bbfc7a2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4054,7 +4054,7 @@ static HRESULT WINAPI ddraw3_DuplicateSurface(IDirectDraw3 *iface, TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); src7 = (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src); hr = ddraw7_DuplicateSurface((IDirectDraw7 *)ddraw_from_ddraw3(iface), src7, &dst7); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return hr; *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; return hr; @@ -4069,7 +4069,7 @@ static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); src7 = (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src); hr = ddraw7_DuplicateSurface((IDirectDraw7 *)ddraw_from_ddraw2(iface), src7, &dst7); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return hr; *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; return hr; @@ -4084,7 +4084,7 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); src7 = (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src); hr = ddraw7_DuplicateSurface((IDirectDraw7 *)ddraw_from_ddraw1(iface), src7, &dst7); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) return hr; *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; return hr;

1 0

Michael Stefaniuc : gameux: Don't bother to output a "stub" FIXME in DllCanUnloadNow().
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: af11c94b31e750e529f8f82ada1e71fa988b22ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=af11c94b31e750e529f8f82ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Aug 15 22:27:24 2010 +0200 gameux: Don't bother to output a "stub" FIXME in DllCanUnloadNow(). --- dlls/gameux/main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/main.c b/dlls/gameux/main.c index 205d48e..8f1831d 100644 --- a/dlls/gameux/main.c +++ b/dlls/gameux/main.c @@ -37,7 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("stub\n"); return S_FALSE; }

1 0

Michael Stefaniuc : explorerframe: Don't cast NULL.
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 7bef239bc40ecb90e1013d5b8344c8e61bf3896f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bef239bc40ecb90e1013d5b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Aug 15 22:27:36 2010 +0200 explorerframe: Don't cast NULL. --- dlls/explorerframe/nstc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 5f6de53..320b67d 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -167,7 +167,7 @@ static IShellItem *shellitem_from_treeitem(NSTC2Impl *This, HTREEITEM hitem) TVITEMEXW tvi; tvi.mask = TVIF_PARAM; - tvi.lParam = (LPARAM)NULL; + tvi.lParam = 0; tvi.hItem = hitem; SendMessageW(This->hwnd_tv, TVM_GETITEMW, 0, (LPARAM)&tvi);

1 0

Henri Verbeet : wined3d: Reattach FBO attachments when any of the corresponding surfaces is unloaded .
by Alexandre Julliard 16 Aug '10

16 Aug '10

Module: wine Branch: master Commit: 5f2fcfdd6b3b7ab9c15d2c450a87527d13d144c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2fcfdd6b3b7ab9c15d2c450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 15 23:21:42 2010 +0200 wined3d: Reattach FBO attachments when any of the corresponding surfaces is unloaded. --- dlls/wined3d/basetexture.c | 2 + dlls/wined3d/buffer.c | 2 + dlls/wined3d/context.c | 92 ++++++++++++++++++++++++++-------------- dlls/wined3d/device.c | 2 +- dlls/wined3d/resource.c | 6 +++ dlls/wined3d/surface.c | 2 + dlls/wined3d/volume.c | 13 ++++-- dlls/wined3d/wined3d_private.h | 5 ++- 8 files changed, 85 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index deab4fb..922550d 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -129,6 +129,8 @@ void basetexture_unload(IWineD3DBaseTexture *iface) This->baseTexture.texture_rgb.dirty = TRUE; This->baseTexture.texture_srgb.dirty = TRUE; + + resource_unload((IWineD3DResourceImpl *)This); } DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD LODNew) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7c898cd..31a1492 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -720,6 +720,8 @@ static void STDMETHODCALLTYPE buffer_UnLoad(IWineD3DBuffer *iface) This->conversion_stride = 0; This->flags &= ~WINED3D_BUFFER_HASDESC; } + + resource_unload((IWineD3DResourceImpl *)This); } static ULONG STDMETHODCALLTYPE buffer_Release(IWineD3DBuffer *iface) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7e3e813..e22149c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -650,50 +650,78 @@ void context_free_event_query(struct wined3d_event_query *query) context->free_event_queries[context->free_event_query_count++] = query->object; } -void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource, WINED3DRESOURCETYPE type) +typedef void (context_fbo_entry_func_t)(struct wined3d_context *context, struct fbo_entry *entry); + +static void context_enum_surface_fbo_entries(IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *surface, context_fbo_entry_func_t *callback) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT i; - if (!This->d3d_initialized) return; - - switch(type) + for (i = 0; i < device->numContexts; ++i) { - case WINED3DRTYPE_SURFACE: + struct wined3d_context *context = device->contexts[i]; + const struct wined3d_gl_info *gl_info = context->gl_info; + struct fbo_entry *entry, *entry2; + + if (context->current_rt == surface) context->current_rt = NULL; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { - for (i = 0; i < This->numContexts; ++i) - { - struct wined3d_context *context = This->contexts[i]; - const struct wined3d_gl_info *gl_info = context->gl_info; - struct fbo_entry *entry, *entry2; + UINT j; - if (context->current_rt == (IWineD3DSurfaceImpl *)resource) context->current_rt = NULL; + if (entry->depth_stencil == surface) + { + callback(context, entry); + continue; + } - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) + for (j = 0; j < gl_info->limits.buffers; ++j) + { + if (entry->render_targets[j] == surface) { - UINT j; - - if (entry->depth_stencil == (IWineD3DSurfaceImpl *)resource) - { - list_remove(&entry->entry); - list_add_head(&context->fbo_destroy_list, &entry->entry); - continue; - } - - for (j = 0; j < gl_info->limits.buffers; ++j) - { - if (entry->render_targets[j] == (IWineD3DSurfaceImpl *)resource) - { - list_remove(&entry->entry); - list_add_head(&context->fbo_destroy_list, &entry->entry); - break; - } - } + callback(context, entry); + break; } } + } + } +} +static void context_queue_fbo_entry_destruction(struct wined3d_context *context, struct fbo_entry *entry) +{ + list_remove(&entry->entry); + list_add_head(&context->fbo_destroy_list, &entry->entry); +} + +void context_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type) +{ + if (!device->d3d_initialized) return; + + switch (type) + { + case WINED3DRTYPE_SURFACE: + context_enum_surface_fbo_entries(device, (IWineD3DSurfaceImpl *)resource, + context_queue_fbo_entry_destruction); + break; + + default: + break; + } +} + +static void context_detach_fbo_entry(struct wined3d_context *context, struct fbo_entry *entry) +{ + entry->attached = FALSE; +} + +void context_resource_unloaded(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type) +{ + switch (type) + { + case WINED3DRTYPE_SURFACE: + context_enum_surface_fbo_entries(device, (IWineD3DSurfaceImpl *)resource, + context_detach_fbo_entry); break; - } default: break; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f4bce23..4b62170 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6546,7 +6546,7 @@ void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resour TRACE("(%p) : resource %p\n", This, resource); - context_resource_released((IWineD3DDevice *)This, resource, type); + context_resource_released(This, resource, type); switch (type) { /* TODO: check front and back buffers, rendertargets etc.. possibly swapchains? */ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 67622a3..11db1f8 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -105,6 +105,12 @@ void resource_cleanup(IWineD3DResource *iface) if (This->resource.device) device_resource_released(This->resource.device, iface); } +void resource_unload(IWineD3DResourceImpl *resource) +{ + context_resource_unloaded(resource->resource.device, (IWineD3DResource *)resource, + resource->resource.resourceType); +} + static PrivateData* resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag) { PrivateData *data; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 101c8c2..514c7b2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1230,6 +1230,8 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { } context_release(context); + + resource_unload((IWineD3DResourceImpl *)This); } /* ****************************************************** diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 42e61e6..c22c263 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -166,11 +166,14 @@ static void WINAPI IWineD3DVolumeImpl_PreLoad(IWineD3DVolume *iface) { FIXME("iface %p stub!\n", iface); } -static void WINAPI IWineD3DVolumeImpl_UnLoad(IWineD3DVolume *iface) { - /* The whole content is shadowed on This->resource.allocatedMemory, and the - * texture name is managed by the VolumeTexture container - */ - TRACE("(%p): Nothing to do\n", iface); +static void WINAPI IWineD3DVolumeImpl_UnLoad(IWineD3DVolume *iface) +{ + TRACE("iface %p.\n", iface); + + /* The whole content is shadowed on This->resource.allocatedMemory, and + * the texture name is managed by the VolumeTexture container. */ + + resource_unload((IWineD3DResourceImpl *)iface); } static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 08104eb..cc54228 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1177,7 +1177,9 @@ void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPE struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_resource_released(IWineD3DDevice *iface, +void context_resource_released(IWineD3DDeviceImpl *device, + IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; +void context_resource_unloaded(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; @@ -1776,6 +1778,7 @@ WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) DECLSPEC_HIDDEN; DWORD resource_set_priority(IWineD3DResource *iface, DWORD new_priority) DECLSPEC_HIDDEN; HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; +void resource_unload(IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16

1 0