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

Alexandre Julliard : user32: Store color and mask bitmaps in the cursor data.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: f78c5c940a40e8d487dc09d09e527dcbe2b83abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78c5c940a40e8d487dc09d09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 12:03:45 2010 +0200 user32: Store color and mask bitmaps in the cursor data. --- dlls/user32/cursoricon.c | 219 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 181 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f78c5c940a40e8d487dc0…

1 0

Hans Leidekker : msi: Fix memory leaks in deformat_string_internal.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: a4c25196b0c83a5fd042bdc615e9b3cc073f6b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c25196b0c83a5fd042bdc61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 20 12:00:53 2010 +0200 msi: Fix memory leaks in deformat_string_internal. --- dlls/msi/format.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 278a08f..c4ff30f 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -805,12 +805,12 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, format.deformatted = *data; format.len = *len; - stack = create_stack(); - temp = create_stack(); - if (!verify_format(*data)) return ERROR_SUCCESS; + stack = create_stack(); + temp = create_stack(); + while ((type = format_lex(&format, &str)) != FORMAT_NULL) { if (type == FORMAT_LBRACK || type == FORMAT_LBRACE ||

1 0

Jörg Höhle : winmm: Have MCI drivers handle notification for MCI_OPEN.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: 594a70f55024c1c98cf842f21a4aaea8a6017cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=594a70f55024c1c98cf842f21… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed May 19 05:42:18 2010 +0200 winmm: Have MCI drivers handle notification for MCI_OPEN. All notifications are handled locally by the drivers. --- dlls/mciavi32/mciavi.c | 5 +++++ dlls/mcicda/mcicda.c | 11 +++++++++-- dlls/mciqtz32/mciqtz.c | 3 +++ dlls/mciseq/mcimidi.c | 5 +++++ dlls/winmm/mci.c | 8 +------- dlls/winmm/tests/mci.c | 3 +-- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index a3bce9d..731083e 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -286,6 +286,11 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, } LeaveCriticalSection(&wma->cs); + + if (!dwRet && (dwFlags & MCI_NOTIFY)) { + mciDriverNotify(HWND_32(LOWORD(lpOpenParms->dwCallback)), + wDevID, MCI_NOTIFY_SUCCESSFUL); + } return dwRet; } diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 5c99534..9f62594 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -464,8 +464,15 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar /* now, open the handle */ root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (wmcda->handle != INVALID_HANDLE_VALUE) - return 0; + if (wmcda->handle == INVALID_HANDLE_VALUE) + goto the_error; + + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpOpenParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpOpenParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; the_error: --wmcda->nUseCount; diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 75f2c01..a42529b 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -221,6 +221,9 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, wma->opened = TRUE; + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpOpenParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); + return 0; err: diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 87753c3..ec9a24a 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -799,6 +799,11 @@ static DWORD MIDI_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpParms) } else { wmm->dwPositionMS = 0; wmm->dwStatus = MCI_MODE_STOP; + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } } return dwRet; } diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 8a66ab4..f65aee7 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1660,16 +1660,10 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) /* only handled devices fall through */ TRACE("wDevID=%04X wDeviceID=%d dwRet=%d\n", wmd->wDeviceID, lpParms->wDeviceID, dwRet); - - if (dwParam & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, wmd->wDeviceID, MCI_NOTIFY_SUCCESSFUL); - return 0; + errCleanUp: if (wmd) MCI_UnLoadMciDriver(wmd); - - if (dwParam & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, 0, MCI_NOTIFY_FAILURE); return dwRet; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index b064c0c..66633bc 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -359,9 +359,8 @@ static void test_recordWAVE(HWND hwnd) err = mciGetDeviceID("waveaudio"); todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); - /* In Wine, both MCI_Open and the individual drivers send notifications. */ test_notification(hwnd, "open new", MCI_NOTIFY_SUCCESSFUL); - todo_wine test_notification(hwnd, "open new no #2", 0); + test_notification(hwnd, "open new no #2", 0); /* Do not query time format as string because result depends on locale! */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT;

1 0

Alexandre Julliard : user32: Define an explicit structure for storing the cursor data.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: e58afcfb2dd4263f4b41f9d118d19f25a925d94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58afcfb2dd4263f4b41f9d11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 11:56:23 2010 +0200 user32: Define an explicit structure for storing the cursor data. --- dlls/user32/cursoricon.c | 174 +++++++++++++++++++++++----------------------- 1 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e58afcfb2dd4263f4b41f…

1 0

Alexandre Julliard : user32: Use the stored color and mask bitmaps instead of the raw bits in GetIconInfo .
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: efe1c945f29628035c3668d2936fc463146a84da URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe1c945f29628035c3668d29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 14:27:08 2010 +0200 user32: Use the stored color and mask bitmaps instead of the raw bits in GetIconInfo. --- dlls/user32/cursoricon.c | 41 ++++++++++++----------------------------- 1 files changed, 12 insertions(+), 29 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2647365..06a93d5 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2049,47 +2049,30 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) */ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) { - struct cursoricon_object *ciconinfo; - INT height; + struct cursoricon_object *ptr; - if (!(ciconinfo = get_icon_ptr( hIcon ))) return FALSE; + if (!(ptr = get_icon_ptr( hIcon ))) return FALSE; TRACE("%p => %dx%d, %d bpp\n", hIcon, - ciconinfo->data.nWidth, ciconinfo->data.nHeight, ciconinfo->data.bBitsPerPixel); + ptr->data.nWidth, ptr->data.nHeight, ptr->data.bBitsPerPixel); - if ( (ciconinfo->data.ptHotSpot.x == ICON_HOTSPOT) && - (ciconinfo->data.ptHotSpot.y == ICON_HOTSPOT) ) + if ( (ptr->data.ptHotSpot.x == ICON_HOTSPOT) && + (ptr->data.ptHotSpot.y == ICON_HOTSPOT) ) { iconinfo->fIcon = TRUE; - iconinfo->xHotspot = ciconinfo->data.nWidth / 2; - iconinfo->yHotspot = ciconinfo->data.nHeight / 2; + iconinfo->xHotspot = ptr->data.nWidth / 2; + iconinfo->yHotspot = ptr->data.nHeight / 2; } else { iconinfo->fIcon = FALSE; - iconinfo->xHotspot = ciconinfo->data.ptHotSpot.x; - iconinfo->yHotspot = ciconinfo->data.ptHotSpot.y; - } - - height = ciconinfo->data.nHeight; - - if (ciconinfo->data.bBitsPerPixel > 1) - { - iconinfo->hbmColor = CreateBitmap( ciconinfo->data.nWidth, ciconinfo->data.nHeight, - ciconinfo->data.bPlanes, ciconinfo->data.bBitsPerPixel, - (char *)(ciconinfo + 1) - + ciconinfo->data.nHeight * - get_bitmap_width_bytes (ciconinfo->data.nWidth,1) ); - } - else - { - iconinfo->hbmColor = 0; - height *= 2; + iconinfo->xHotspot = ptr->data.ptHotSpot.x; + iconinfo->yHotspot = ptr->data.ptHotSpot.y; } - iconinfo->hbmMask = CreateBitmap ( ciconinfo->data.nWidth, height, - 1, 1, ciconinfo + 1); - release_icon_ptr( hIcon, ciconinfo ); + iconinfo->hbmColor = copy_bitmap( ptr->color ); + iconinfo->hbmMask = copy_bitmap( ptr->mask ); + release_icon_ptr( hIcon, ptr ); return TRUE; }

1 0

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

May 20, 2010

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

Juan Lang : crypt32/tests: Allow specifying a chain engine when verifying a chain policy.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: fbd3a1dd7b20507019db24070845f53200ef5c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd3a1dd7b20507019db24070… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 19 18:00:25 2010 -0700 crypt32/tests: Allow specifying a chain engine when verifying a chain policy. --- dlls/crypt32/tests/chain.c | 74 ++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 4983020..900a30d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3883,12 +3883,12 @@ static const char *num_to_str(WORD num) return buf; } -static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, - DWORD testIndex, SYSTEMTIME *sysTime, PCERT_CHAIN_POLICY_PARA para) - +static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, + const ChainPolicyCheck *check, DWORD testIndex, SYSTEMTIME *sysTime, + PCERT_CHAIN_POLICY_PARA para) { - PCCERT_CHAIN_CONTEXT chain = getChain(NULL, &check->certs, 0, TRUE, sysTime, - check->todo, testIndex); + PCCERT_CHAIN_CONTEXT chain = getChain(engine, &check->certs, 0, TRUE, + sysTime, check->todo, testIndex); if (chain) { @@ -4004,33 +4004,33 @@ static void check_ssl_policy(void) /* Check ssl policy with no parameter */ for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, NULL); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, NULL); /* Check again with a policy parameter that specifies nothing */ for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* Check yet again, but specify an empty SSL_EXTRA_CERT_CHAIN_POLICY_PARA * argument. */ policyPara.pvExtraPolicyPara = &sslPolicyPara; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* And again, but specify the auth type as a client */ sslPolicyPara.dwAuthType = AUTHTYPE_CLIENT; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* And again, but specify the auth type as a server */ sslPolicyPara.dwAuthType = AUTHTYPE_SERVER; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* And again authenticating a client, but specify the size of the policy * parameter. */ @@ -4038,78 +4038,78 @@ static void check_ssl_policy(void) sslPolicyPara.dwAuthType = AUTHTYPE_CLIENT; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* One more time authenticating a client, but specify winehq.org as the * server name. */ sslPolicyPara.pwszServerName = winehq; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* And again authenticating a server, still specifying winehq.org as the * server name. */ sslPolicyPara.dwAuthType = AUTHTYPE_SERVER; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* And again authenticating a server, this time specifying the size of the * policy param. */ policyPara.cbSize = sizeof(policyPara); for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* Yet again, but checking the iTunes chain, which contains a name * extension. */ - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &iTunesPolicyCheckWithoutMatchingName, 0, &oct2007, &policyPara); /* And again, but checking the Google chain at a bad date */ sslPolicyPara.pwszServerName = google_dot_com; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &googlePolicyCheckWithMatchingNameExpired, 0, &oct2007, &policyPara); /* And again, but checking the Google chain at a good date */ sslPolicyPara.pwszServerName = google_dot_com; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &googlePolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* Check again with the openssl cert, which has a wildcard in its name, * with various combinations of matching and non-matching names. * With "a.openssl.org": match */ sslPolicyPara.pwszServerName = a_dot_openssl_dot_org; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &opensslPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* With "openssl.org": no match */ sslPolicyPara.pwszServerName = openssl_dot_org; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); /* With "fopenssl.org": no match */ sslPolicyPara.pwszServerName = fopenssl_dot_org; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); /* with "a.b.openssl.org": no match */ sslPolicyPara.pwszServerName = a_dot_b_dot_openssl_dot_org; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); /* Check again with the cs.stanford.edu, which has both cs.stanford.edu * and www.cs.stanford.edu in its subject alternative name. * With "cs.stanford.edu": match */ sslPolicyPara.pwszServerName = cs_dot_stanford_dot_edu; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &stanfordPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* With "www.cs.stanford.edu": match */ sslPolicyPara.pwszServerName = www_dot_cs_dot_stanford_dot_edu; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &stanfordPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* With "a.cs.stanford.edu": no match */ sslPolicyPara.pwszServerName = a_dot_cs_dot_stanford_dot_edu; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &stanfordPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); } @@ -4177,8 +4177,8 @@ static void testVerifyCertChainPolicy(void) for (i = 0; i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, &basePolicyCheck[i], i, - &oct2007, NULL); + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &basePolicyCheck[i], i, &oct2007, NULL); check_ssl_policy(); /* The authenticode policy doesn't seem to check anything beyond the base * policy. It might check for chains signed by the MS test cert, but none @@ -4186,12 +4186,12 @@ static void testVerifyCertChainPolicy(void) */ for (i = 0; i < sizeof(authenticodePolicyCheck) / sizeof(authenticodePolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_AUTHENTICODE, + checkChainPolicyStatus(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, &authenticodePolicyCheck[i], i, &oct2007, NULL); for (i = 0; i < sizeof(basicConstraintsPolicyCheck) / sizeof(basicConstraintsPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, NULL, &basicConstraintsPolicyCheck[i], i, &oct2007, NULL); }

1 0

Juan Lang : crypt32: Support hExclusiveRoot when creating a certificate chain engine.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: d298e1e614f1d3f48a1a21b9fca21ea217029c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d298e1e614f1d3f48a1a21b9f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 19 16:46:11 2010 -0700 crypt32: Support hExclusiveRoot when creating a certificate chain engine. --- dlls/crypt32/chain.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ec7f602..d324314 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -186,7 +186,10 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, HCERTSTORE root; HCERTCHAINENGINE engine; - if (pConfig->hRestrictedRoot) + if (pConfig->cbSize >= sizeof(CERT_CHAIN_ENGINE_CONFIG) && + pConfig->hExclusiveRoot) + root = CertDuplicateStore(pConfig->hExclusiveRoot); + else if (pConfig->hRestrictedRoot) root = CertDuplicateStore(pConfig->hRestrictedRoot); else root = CertOpenSystemStoreW(0, rootW);

1 0

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

May 20, 2010

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

Henri Verbeet : wined3d: Check for a destination clipper in IWineD3DBaseSurfaceImpl_Blt().
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: becf8dc82829b403068d61908c77c98a406aea3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=becf8dc82829b403068d61908… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 09:12:18 2010 +0200 wined3d: Check for a destination clipper in IWineD3DBaseSurfaceImpl_Blt(). This check was there in the original ddraw code, but apparently got lost during the ddraw rewrite in 2006. --- dlls/wined3d/surface_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d752827..9778c81 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1009,7 +1009,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D /* 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 == NULL*/ TRUE) && (DestRect) && + 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) ||

1 0