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

Henri Verbeet : wined3d: Split checking for "empty" source and destination rectangles in IWineD3DBaseSurfaceImpl_Blt().
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: c48ff6c12a35703a3c982ca2db40870c4639bab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48ff6c12a35703a3c982ca2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 09:12:19 2010 +0200 wined3d: Split checking for "empty" source and destination rectangles in IWineD3DBaseSurfaceImpl_Blt(). Assuming this is supposed to check for empty source / destination rectangles, the check doesn't look quite right to me. I'm going to leave that alone for the time being though. --- dlls/wined3d/surface_base.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 9778c81..43642de 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1020,21 +1020,24 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D return WINEDDERR_INVALIDRECT; } - /* Now handle negative values in the rectangles. Warning: only supported for now - in the 'simple' cases (ie not in any stretching / rotation cases). - - First, the case where nothing is to be done. - */ - if ((DestRect && ((DestRect->bottom <= 0) || (DestRect->right <= 0) || - (DestRect->top >= (int) This->currentDesc.Height) || - (DestRect->left >= (int) This->currentDesc.Width))) || - ((Src != NULL) && (SrcRect != NULL) && - ((SrcRect->bottom <= 0) || (SrcRect->right <= 0) || - (SrcRect->top >= (int) Src->currentDesc.Height) || - (SrcRect->left >= (int) Src->currentDesc.Width)) )) + /* Now handle negative values in the rectangles. Warning: only supported + * for now in the 'simple' cases (ie not in any stretching / rotation + * cases). First, the case where nothing is to be done. */ + + if (DestRect && (DestRect->bottom <= 0 || DestRect->right <= 0 + || DestRect->top >= (int)This->currentDesc.Height + || DestRect->left >= (int)This->currentDesc.Width)) + { + TRACE("Nothing to be done.\n"); + return WINED3D_OK; + } + + if (Src && SrcRect && (SrcRect->bottom <= 0 || SrcRect->right <= 0 + || SrcRect->top >= (int)Src->currentDesc.Height + || SrcRect->left >= (int)Src->currentDesc.Width)) { - TRACE("Nothing to be done !\n"); - return WINED3D_OK; + TRACE("Nothing to be done.\n"); + return WINED3D_OK; } if (DestRect)

1 0

Henri Verbeet : wined3d: Merge source rectangle operations into a single block in IWineD3DBaseSurfaceImpl_Blt ().
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 3884bb3bdca854522a7c5c9ad5a4575c8d7c012a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3884bb3bdca854522a7c5c9ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 09:12:20 2010 +0200 wined3d: Merge source rectangle operations into a single block in IWineD3DBaseSurfaceImpl_Blt(). --- dlls/wined3d/surface_base.c | 76 +++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 43642de..4e964da 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -993,19 +993,46 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D FIXME("Filters not supported in software blit\n"); } - /* First check for the validity of source / destination rectangles. This was - * verified using a test application + by MSDN. - */ - if ((Src != NULL) && (SrcRect != NULL) && - ((SrcRect->bottom > Src->currentDesc.Height)||(SrcRect->bottom < 0) || - (SrcRect->top > Src->currentDesc.Height)||(SrcRect->top < 0) || - (SrcRect->left > Src->currentDesc.Width) ||(SrcRect->left < 0) || - (SrcRect->right > Src->currentDesc.Width) ||(SrcRect->right < 0) || - (SrcRect->right < SrcRect->left) ||(SrcRect->bottom < SrcRect->top))) + /* First check for the validity of source / destination rectangles. + * This was verified using a test application + by MSDN. */ + + if (SrcRect) { - WARN("Application gave us bad source rectangle for Blt.\n"); - return WINEDDERR_INVALIDRECT; + if (Src) + { + if (SrcRect->right < SrcRect->left || SrcRect->bottom < SrcRect->top + || SrcRect->left > Src->currentDesc.Width || SrcRect->left < 0 + || SrcRect->top > Src->currentDesc.Height || SrcRect->top < 0 + || SrcRect->right > Src->currentDesc.Width || SrcRect->right < 0 + || SrcRect->bottom > Src->currentDesc.Height || SrcRect->bottom < 0) + { + WARN("Application gave us bad source rectangle for Blt.\n"); + return WINEDDERR_INVALIDRECT; + } + + if (!SrcRect->right || !SrcRect->bottom + || SrcRect->left == (int)Src->currentDesc.Width + || SrcRect->top == (int)Src->currentDesc.Height) + { + TRACE("Nothing to be done.\n"); + return WINED3D_OK; + } + } + + xsrc = *SrcRect; + } + else if (Src) + { + xsrc.left = 0; + xsrc.top = 0; + xsrc.right = Src->currentDesc.Width; + xsrc.bottom = Src->currentDesc.Height; } + else + { + memset(&xsrc, 0, sizeof(xsrc)); + } + /* For the Destination rect, it can be out of bounds on the condition that a clipper * is set for the given surface. */ @@ -1032,14 +1059,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D return WINED3D_OK; } - if (Src && SrcRect && (SrcRect->bottom <= 0 || SrcRect->right <= 0 - || SrcRect->top >= (int)Src->currentDesc.Height - || SrcRect->left >= (int)Src->currentDesc.Width)) - { - TRACE("Nothing to be done.\n"); - return WINED3D_OK; - } - if (DestRect) { xdst = *DestRect; @@ -1052,25 +1071,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D xdst.right = This->currentDesc.Width; } - if (SrcRect) - { - xsrc = *SrcRect; - } - else - { - if (Src) - { - xsrc.top = 0; - xsrc.bottom = Src->currentDesc.Height; - xsrc.left = 0; - xsrc.right = Src->currentDesc.Width; - } - else - { - memset(&xsrc,0,sizeof(xsrc)); - } - } - /* The easy case : the source-less blits.... */ if (Src == NULL && DestRect) {

1 0

Henri Verbeet : wined3d: Merge destination rectangle operations into a single block in IWineD3DBaseSurfaceImpl_Blt ().
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: e5c76f7396773f1861aad3da23600156c8c924a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c76f7396773f1861aad3da2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 09:12:21 2010 +0200 wined3d: Merge destination rectangle operations into a single block in IWineD3DBaseSurfaceImpl_Blt(). --- dlls/wined3d/surface_base.c | 170 +++++++++++++++++++++---------------------- 1 files changed, 84 insertions(+), 86 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 4e964da..b674f9d 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1033,108 +1033,106 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D memset(&xsrc, 0, sizeof(xsrc)); } - /* For the Destination rect, it can be out of bounds on the condition that a clipper - * is set for the given surface. - */ - if (!This->clipper && DestRect && - ((DestRect->bottom > This->currentDesc.Height)||(DestRect->bottom < 0) || - (DestRect->top > This->currentDesc.Height)||(DestRect->top < 0) || - (DestRect->left > This->currentDesc.Width) ||(DestRect->left < 0) || - (DestRect->right > This->currentDesc.Width) ||(DestRect->right < 0) || - (DestRect->right < DestRect->left) ||(DestRect->bottom < DestRect->top))) + if (DestRect) { - WARN("Application gave us bad destination rectangle for Blt without a clipper set.\n"); - return WINEDDERR_INVALIDRECT; - } + /* For the Destination rect, it can be out of bounds on the condition + * that a clipper is set for the given surface. */ + if (!This->clipper && (DestRect->right < DestRect->left || DestRect->bottom < DestRect->top + || DestRect->left > This->currentDesc.Width || DestRect->left < 0 + || DestRect->top > This->currentDesc.Height || DestRect->top < 0 + || DestRect->right > This->currentDesc.Width || DestRect->right < 0 + || DestRect->bottom > This->currentDesc.Height || DestRect->bottom < 0)) + { + WARN("Application gave us bad destination rectangle for Blt without a clipper set.\n"); + return WINEDDERR_INVALIDRECT; + } - /* Now handle negative values in the rectangles. Warning: only supported - * for now in the 'simple' cases (ie not in any stretching / rotation - * cases). First, the case where nothing is to be done. */ + if (DestRect->right <= 0 || DestRect->bottom <= 0 + || DestRect->left >= (int)This->currentDesc.Width + || DestRect->top >= (int)This->currentDesc.Height) + { + TRACE("Nothing to be done.\n"); + return WINED3D_OK; + } - if (DestRect && (DestRect->bottom <= 0 || DestRect->right <= 0 - || DestRect->top >= (int)This->currentDesc.Height - || DestRect->left >= (int)This->currentDesc.Width)) - { - TRACE("Nothing to be done.\n"); - return WINED3D_OK; - } + if (!Src) + { + RECT full_rect; - if (DestRect) - { - xdst = *DestRect; - } - else - { - xdst.top = 0; - xdst.bottom = This->currentDesc.Height; - xdst.left = 0; - xdst.right = This->currentDesc.Width; - } + full_rect.left = 0; + full_rect.top = 0; + full_rect.right = This->currentDesc.Width; + full_rect.bottom = This->currentDesc.Height; + IntersectRect(&xdst, &full_rect, DestRect); + } + else + { + BOOL clip_horiz, clip_vert; - /* The easy case : the source-less blits.... */ - if (Src == NULL && DestRect) - { - RECT full_rect; - RECT temp_rect; /* No idea if intersect rect can be the same as one of the source rect */ + xdst = *DestRect; + clip_horiz = xdst.left < 0 || xdst.right > (int)This->currentDesc.Width; + clip_vert = xdst.top < 0 || xdst.bottom > (int)This->currentDesc.Height; - full_rect.left = 0; - full_rect.top = 0; - full_rect.right = This->currentDesc.Width; - full_rect.bottom = This->currentDesc.Height; - IntersectRect(&temp_rect, &full_rect, DestRect); - xdst = temp_rect; - } - else if (DestRect) - { - /* Only handle clipping on the destination rectangle */ - int clip_horiz = (DestRect->left < 0) || (DestRect->right > (int) This->currentDesc.Width ); - int clip_vert = (DestRect->top < 0) || (DestRect->bottom > (int) This->currentDesc.Height); - if (clip_vert || clip_horiz) - { - /* Now check if this is a special case or not... */ - if ((((DestRect->bottom - DestRect->top ) != (xsrc.bottom - xsrc.top )) && clip_vert ) || - (((DestRect->right - DestRect->left) != (xsrc.right - xsrc.left)) && clip_horiz) || - (Flags & WINEDDBLT_DDFX)) + if (clip_vert || clip_horiz) { - WARN("Out of screen rectangle in special case. Not handled right now.\n"); - return WINED3D_OK; - } + /* Now check if this is a special case or not... */ + if ((Flags & WINEDDBLT_DDFX) + || (clip_horiz && xdst.right - xdst.left != xsrc.right - xsrc.left) + || (clip_vert && xdst.bottom - xdst.top != xsrc.bottom - xsrc.top)) + { + WARN("Out of screen rectangle in special case. Not handled right now.\n"); + return WINED3D_OK; + } - if (clip_horiz) - { - if (DestRect->left < 0) { xsrc.left -= DestRect->left; xdst.left = 0; } - if (DestRect->right > This->currentDesc.Width) + if (clip_horiz) { - xsrc.right -= (DestRect->right - (int) This->currentDesc.Width); - xdst.right = (int) This->currentDesc.Width; + if (xdst.left < 0) + { + xsrc.left -= xdst.left; + xdst.left = 0; + } + if (xdst.right > This->currentDesc.Width) + { + xsrc.right -= (xdst.right - (int)This->currentDesc.Width); + xdst.right = (int)This->currentDesc.Width; + } } - } - if (clip_vert) - { - if (DestRect->top < 0) + + if (clip_vert) { - xsrc.top -= DestRect->top; - xdst.top = 0; + if (xdst.top < 0) + { + xsrc.top -= xdst.top; + xdst.top = 0; + } + if (xdst.bottom > This->currentDesc.Height) + { + xsrc.bottom -= (xdst.bottom - (int)This->currentDesc.Height); + xdst.bottom = (int)This->currentDesc.Height; + } } - if (DestRect->bottom > This->currentDesc.Height) + + /* And check if after clipping something is still to be done... */ + if ((xdst.right <= 0) || (xdst.bottom <= 0) + || (xdst.left >= (int)This->currentDesc.Width) + || (xdst.top >= (int)This->currentDesc.Height) + || (xsrc.right <= 0) || (xsrc.bottom <= 0) + || (xsrc.left >= (int) Src->currentDesc.Width) + || (xsrc.top >= (int)Src->currentDesc.Height)) { - xsrc.bottom -= (DestRect->bottom - (int) This->currentDesc.Height); - xdst.bottom = (int) This->currentDesc.Height; + TRACE("Nothing to be done after clipping.\n"); + return WINED3D_OK; } } - /* And check if after clipping something is still to be done... */ - if ((xdst.bottom <= 0) || (xdst.right <= 0) || - (xdst.top >= (int) This->currentDesc.Height) || - (xdst.left >= (int) This->currentDesc.Width) || - (xsrc.bottom <= 0) || (xsrc.right <= 0) || - (xsrc.top >= (int) Src->currentDesc.Height) || - (xsrc.left >= (int) Src->currentDesc.Width)) - { - TRACE("Nothing to be done after clipping !\n"); - return WINED3D_OK; - } } } + else + { + xdst.left = 0; + xdst.top = 0; + xdst.right = This->currentDesc.Width; + xdst.bottom = This->currentDesc.Height; + } if (Src == This) {

1 0

Henri Verbeet : wined3d: Translate front buffer coordinates in surface_blt_to_drawable().
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: a2a58a21d89e1d73a7d7659aeed46445e6c7c079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a58a21d89e1d73a7d7659ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 09:12:22 2010 +0200 wined3d: Translate front buffer coordinates in surface_blt_to_drawable(). --- dlls/wined3d/surface.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 811ba11..9e1d434 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4350,6 +4350,24 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT dst_rect = src_rect; } + if ((This->Flags & SFLAG_SWAPCHAIN) && This == ((IWineD3DSwapChainImpl *)This->container)->front_buffer) + { + RECT windowsize; + POINT offset = {0, 0}; + UINT h; + + ClientToScreen(context->win_handle, &offset); + GetClientRect(context->win_handle, &windowsize); + h = windowsize.bottom - windowsize.top; + + dst_rect.left -= offset.x; + dst_rect.right -=offset.x; + dst_rect.top -= offset.y; + dst_rect.bottom -=offset.y; + dst_rect.top += This->currentDesc.Height - h; + dst_rect.bottom += This->currentDesc.Height - h; + } + device->blitter->set_shader((IWineD3DDevice *) device, This); ENTER_GL();

1 0

Michael Stefaniuc : wininet: Remove redundant "not NULL/0" checks ( coccicheck).
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 2c07791c5bc02b3415a1f7542dd7e36af5d0f01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c07791c5bc02b3415a1f7542… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:15:33 2010 +0200 wininet: Remove redundant "not NULL/0" checks (coccicheck). --- dlls/wininet/http.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bd2e574..dc6533b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4259,11 +4259,8 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if(hIC->lpszProxyBypass) FIXME("Proxy bypass is ignored.\n"); } - if (lpszServerName && lpszServerName[0]) - { - lpwhs->lpszServerName = heap_strdupW(lpszServerName); - lpwhs->lpszHostName = heap_strdupW(lpszServerName); - } + lpwhs->lpszServerName = heap_strdupW(lpszServerName); + lpwhs->lpszHostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) lpwhs->lpszUserName = heap_strdupW(lpszUserName); if (lpszPassword && lpszPassword[0])

1 0

Piotr Caban : msvcrt: Fix compilation error (x86_64-pc-mingw32).
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 4134c57a917b8a92950c28b7fdd0ecaed03a9e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4134c57a917b8a92950c28b7f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 02:36:44 2010 +0200 msvcrt: Fix compilation error (x86_64-pc-mingw32). --- dlls/msvcrt/locale.c | 74 +++++++++++++++++++++++----------------------- dlls/msvcrt/main.c | 4 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 4 +- 4 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4134c57a917b8a92950c2…

1 0

Michael Stefaniuc : shlwapi: Remove redundant "not NULL" checks of the len arg (coccicheck).
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: f38336d82a05b4f470da3f515b606b6d29d73cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38336d82a05b4f470da3f515… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:14:19 2010 +0200 shlwapi: Remove redundant "not NULL" checks of the len arg (coccicheck). --- dlls/shlwapi/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index e00a925..a0269b6 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1415,7 +1415,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, break; case STRRET_CSTR: - if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len ) && len) + if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) dest[len-1] = 0; break; @@ -1423,7 +1423,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, if (pidl) { if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, - dest, len ) && len) + dest, len )) dest[len-1] = 0; } break;

1 0

Juan Lang : crypt32: Update definition of CERT_CHAIN_ENGINE_CONFIG.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: d3db308853123653fc333fce027900a17c17a3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3db308853123653fc333fce0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 19 18:06:54 2010 -0700 crypt32: Update definition of CERT_CHAIN_ENGINE_CONFIG. --- dlls/crypt32/chain.c | 17 ++++++++++++++++- dlls/crypt32/tests/chain.c | 30 ++++++++++++++++++++++-------- include/wincrypt.h | 2 ++ 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 1724f42..ec7f602 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -152,6 +152,20 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, return engine; } +typedef struct _CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT +{ + DWORD cbSize; + HCERTSTORE hRestrictedRoot; + HCERTSTORE hRestrictedTrust; + HCERTSTORE hRestrictedOther; + DWORD cAdditionalStore; + HCERTSTORE *rghAdditionalStore; + DWORD dwFlags; + DWORD dwUrlRetrievalTimeout; + DWORD MaximumCachedCertificates; + DWORD CycleDetectionModulus; +} CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT; + BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, HCERTCHAINENGINE *phChainEngine) { @@ -159,7 +173,8 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, TRACE("(%p, %p)\n", pConfig, phChainEngine); - if (pConfig->cbSize != sizeof(*pConfig)) + if (pConfig->cbSize != sizeof(CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT) + && pConfig->cbSize != sizeof(CERT_CHAIN_ENGINE_CONFIG)) { SetLastError(E_INVALIDARG); return FALSE; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index f9ccaed..6b23361 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -60,11 +60,25 @@ static BOOL (WINAPI *pCertVerifyCertificateChainPolicy)(LPCSTR,PCCERT_CHAIN_CONT #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) +typedef struct _CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT +{ + DWORD cbSize; + HCERTSTORE hRestrictedRoot; + HCERTSTORE hRestrictedTrust; + HCERTSTORE hRestrictedOther; + DWORD cAdditionalStore; + HCERTSTORE *rghAdditionalStore; + DWORD dwFlags; + DWORD dwUrlRetrievalTimeout; + DWORD MaximumCachedCertificates; + DWORD CycleDetectionModulus; +} CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT; static void testCreateCertChainEngine(void) { BOOL ret; - CERT_CHAIN_ENGINE_CONFIG config = { 0 }; + CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT config = { 0 }; + CERT_CHAIN_ENGINE_CONFIG *pConfig = (CERT_CHAIN_ENGINE_CONFIG *)&config; HCERTCHAINENGINE engine; HCERTSTORE store; @@ -77,21 +91,21 @@ static void testCreateCertChainEngine(void) /* Crash ret = pCertCreateCertificateChainEngine(NULL, NULL); ret = pCertCreateCertificateChainEngine(NULL, &engine); - ret = pCertCreateCertificateChainEngine(&config, NULL); + ret = pCertCreateCertificateChainEngine(pConfig, NULL); */ - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* Crashes config.cbSize = sizeof(config); - ret = pCertCreateCertificateChainEngine(&config, NULL); + ret = pCertCreateCertificateChainEngine(pConfig, NULL); */ config.cbSize = sizeof(config); - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08x\n", GetLastError()); pCertFreeCertificateChainEngine(engine); config.dwFlags = 0xff000000; - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08x\n", GetLastError()); pCertFreeCertificateChainEngine(engine); @@ -99,7 +113,7 @@ static void testCreateCertChainEngine(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); config.hRestrictedRoot = store; - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08x\n", GetLastError()); pCertFreeCertificateChainEngine(engine); @@ -108,7 +122,7 @@ static void testCreateCertChainEngine(void) */ CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert), CERT_STORE_ADD_ALWAYS, NULL); - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); diff --git a/include/wincrypt.h b/include/wincrypt.h index e536213..d3f56b9 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3389,6 +3389,8 @@ typedef struct _CERT_CHAIN_ENGINE_CONFIG DWORD dwUrlRetrievalTimeout; DWORD MaximumCachedCertificates; DWORD CycleDetectionModulus; + HCERTSTORE hExclusiveRoot; + HCERTSTORE hExclusiveRootTrustedPeople; } CERT_CHAIN_ENGINE_CONFIG, *PCERT_CHAIN_ENGINE_CONFIG; /* message-related definitions */

1 0

Michael Stefaniuc : quartz: Avoid using the long type.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 63512e8e98457fd3ba33423a6760c02267c4a352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63512e8e98457fd3ba33423a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:14:09 2010 +0200 quartz: Avoid using the long type. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/dsoundrender.c | 12 ++++++------ dlls/quartz/filtergraph.c | 16 ++++++++-------- dlls/quartz/memallocator.c | 2 +- dlls/quartz/pin.c | 2 +- dlls/quartz/pin.h | 2 +- dlls/quartz/tests/referenceclock.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index c275d83..a032391 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -105,7 +105,7 @@ static HRESULT ACMWrapper_ProcessSampleData(InputPin *pin, IMediaSample *pSample tMed = tStart; - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 8469bbc..b7d45e9 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -101,7 +101,7 @@ static HRESULT AVIDec_ProcessSampleData(InputPin *pin, IMediaSample *pSample) cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) { diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 3d567d2..6107880 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -770,7 +770,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE { const AVISUPERINDEX *pIndex = (const AVISUPERINDEX *)pChunk; DWORD x; - long rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; + UINT rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)) { diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 115577c..b327c00 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -78,8 +78,8 @@ typedef struct DSoundRenderImpl HANDLE state_change, blocked; - long volume; - long pan; + LONG volume; + LONG pan; } DSoundRenderImpl; /* Seeking is not needed for a renderer, rely on newsegment for the appropriate changes */ @@ -238,7 +238,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) { DSoundRenderImpl *This = iface; LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; + LONG cbSrcStream = 0; REFERENCE_TIME tStart, tStop; HRESULT hr; AM_MEDIA_TYPE *amt; @@ -344,7 +344,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) } cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); #if 0 /* For debugging purpose */ { @@ -877,11 +877,11 @@ static HRESULT WINAPI DSoundRender_InputPin_ReceiveConnection(IPin * iface, IPin { hr = IDirectSoundBuffer_SetVolume(DSImpl->dsbuffer, DSImpl->volume); if (FAILED(hr)) - ERR("Can't set volume to %ld (%x)\n", DSImpl->volume, hr); + ERR("Can't set volume to %d (%x)\n", DSImpl->volume, hr); hr = IDirectSoundBuffer_SetPan(DSImpl->dsbuffer, DSImpl->pan); if (FAILED(hr)) - ERR("Can't set pan to %ld (%x)\n", DSImpl->pan, hr); + ERR("Can't set pan to %d (%x)\n", DSImpl->pan, hr); DSImpl->write_pos = 0; hr = S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 66a9a95..18bf97c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -45,14 +45,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { - HWND hWnd; /* Target window */ - long msg; /* User window message */ - long instance; /* User data */ - int disabled; /* Disabled messages posting */ + HWND hWnd; /* Target window */ + UINT msg; /* User window message */ + LONG_PTR instance; /* User data */ + int disabled; /* Disabled messages posting */ } WndNotify; typedef struct { - long lEventCode; /* Event code */ + LONG lEventCode; /* Event code */ LONG_PTR lParam1; /* Param1 */ LONG_PTR lParam2; /* Param2 */ } Event; @@ -120,7 +120,7 @@ static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) return TRUE; } -static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, long msTimeOut) +static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) { if (WaitForSingleObject(omr->msg_event, msTimeOut) != WAIT_OBJECT_0) return FALSE; @@ -182,7 +182,7 @@ typedef struct _IFilterGraphImpl { LPWSTR * pFilterNames; int nFilters; int filterCapacity; - long nameIndex; + LONG nameIndex; IReferenceClock *refClock; EventsQueue evqueue; HANDLE hEventCompletion; @@ -4970,7 +4970,7 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, This->notif.hWnd = (HWND)hwnd; This->notif.msg = lMsg; - This->notif.instance = (long) lInstanceData; + This->notif.instance = lInstanceData; return S_OK; } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 16b94e3..a1c4473 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -785,7 +785,7 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) StdMemAllocator *This = (StdMemAllocator *)iface; StdMediaSample2 * pSample = NULL; SYSTEM_INFO si; - long i; + LONG i; assert(list_empty(&This->base.free_list)); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index ca34d93..fd0d5a2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1834,7 +1834,7 @@ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinI return E_FAIL; } -HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) { OutputPin * pPinImpl; diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 2cbaddb..e356ef3 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -143,7 +143,7 @@ typedef struct PullPin /*** Constructors ***/ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); -HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, STOPPROCESSPROC, REQUESTPROC pCustomRequest, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); /**************************/ diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index 164fc3d..ddce02e 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -54,7 +54,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock HRESULT hr; REFERENCE_TIME time1; REFERENCE_TIME time2; - signed long diff; + LONG diff; /* Test response from invalid (NULL) argument */ hr = IReferenceClock_GetTime(pClock, NULL); @@ -86,7 +86,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock /* FIXME: How much deviation should be allowed after a sleep? */ /* 0.3% is common, and 0.4% is sometimes observed. */ diff = time2 - time1; - ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); + ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %u\n", clockdesc, diff); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 40b1acb..268373f 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -343,7 +343,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) { VideoRendererImpl *This = iface; LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; + LONG cbSrcStream = 0; REFERENCE_TIME tStart, tStop; HRESULT hr; @@ -395,7 +395,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("val %p %ld\n", pbSrcStream, cbSrcStream); + TRACE("val %p %d\n", pbSrcStream, cbSrcStream); #if 0 /* For debugging purpose */ {

1 0

Michael Stefaniuc : msxml3: Remove redundant "not NULL" check of the punk arg.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 49c5494ff83ded3bc93f74182adbd49536f226c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c5494ff83ded3bc93f74182… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:15:22 2010 +0200 msxml3: Remove redundant "not NULL" check of the punk arg. --- dlls/msxml3/domdoc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index aae8a34..d72d20b 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2177,8 +2177,7 @@ xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) return S_OK; } - if ( punk ) - IUnknown_AddRef( punk ); + IUnknown_AddRef( punk ); if(This->site) IUnknown_Release( This->site );

1 0