October 2013 - Wine-Commits

Dmitry Timoshkov : gdiplus: Reimplement GdipCloneBitmapArea without using GdipBitmapLockBits.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: df367c339973c471b0792151ddec0db19b9da1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df367c339973c471b0792151d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 18 14:04:46 2013 +0900 gdiplus: Reimplement GdipCloneBitmapArea without using GdipBitmapLockBits. --- dlls/gdiplus/image.c | 33 +++++---------------------------- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e9191e..83b0b08 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1224,9 +1224,6 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - BitmapData lockeddata_src, lockeddata_dst; - int i; - UINT row_size; Rect area; GpStatus stat; @@ -1248,39 +1245,19 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, area.Width = gdip_round(width); area.Height = gdip_round(height); - stat = GdipBitmapLockBits(srcBitmap, &area, ImageLockModeRead, format, - &lockeddata_src); - if (stat != Ok) return stat; - - stat = GdipCreateBitmapFromScan0(lockeddata_src.Width, lockeddata_src.Height, - 0, lockeddata_src.PixelFormat, NULL, dstBitmap); + stat = GdipCreateBitmapFromScan0(area.Width, area.Height, 0, format, NULL, dstBitmap); if (stat == Ok) { - stat = GdipBitmapLockBits(*dstBitmap, NULL, ImageLockModeWrite, - lockeddata_src.PixelFormat, &lockeddata_dst); - - if (stat == Ok) - { - /* copy the image data */ - row_size = (lockeddata_src.Width * PIXELFORMATBPP(lockeddata_src.PixelFormat) +7)/8; - for (i=0; i<lockeddata_src.Height; i++) - memcpy((BYTE*)lockeddata_dst.Scan0+lockeddata_dst.Stride*i, - (BYTE*)lockeddata_src.Scan0+lockeddata_src.Stride*i, - row_size); - - GdipBitmapUnlockBits(*dstBitmap, &lockeddata_dst); - } - + stat = convert_pixels(area.Width, area.Height, (*dstBitmap)->stride, (*dstBitmap)->bits, (*dstBitmap)->format, + srcBitmap->stride, + srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8, + srcBitmap->format, srcBitmap->image.palette); if (stat != Ok) GdipDisposeImage((GpImage*)*dstBitmap); } - GdipBitmapUnlockBits(srcBitmap, &lockeddata_src); - if (stat != Ok) - { *dstBitmap = NULL; - } return stat; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 650d12f..63d37cb 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4257,7 +4257,6 @@ static void test_CloneBitmapArea(void) expect(WrongState, status); status = GdipCloneBitmapAreaI(0, 0, 1, 1, PixelFormat24bppRGB, bitmap, &copy); -todo_wine expect(Ok, status); status = GdipBitmapUnlockBits(bitmap, &data);

1 0

Alexandre Julliard : explorer: Avoid crashing when the desktop launchers are not initialized.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 0d40cdc7796d1e688a0c80576b313aeda13198f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d40cdc7796d1e688a0c80576… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 13:29:39 2013 +0200 explorer: Avoid crashing when the desktop launchers are not initialized. --- programs/explorer/desktop.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4c38edb..3ea3e60 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -88,8 +88,10 @@ static RECT get_title_rect( unsigned int index ) static const struct launcher *launcher_from_point( int x, int y ) { RECT icon, title; - unsigned int index = x / launcher_size + (y / launcher_size) * launchers_per_row; + unsigned int index; + if (!nb_launchers) return NULL; + index = x / launcher_size + (y / launcher_size) * launchers_per_row; if (index >= nb_launchers) return NULL; icon = get_icon_rect( index ); @@ -523,6 +525,7 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR return 0; case WM_LBUTTONDBLCLK: + if (!using_root) { const struct launcher *launcher = launcher_from_point( (short)LOWORD(lp), (short)HIWORD(lp) ); if (launcher) do_launch( launcher );

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipCloneImage using GdipCloneBitmapArea for a bitmap.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: b528e01d85e4e81f670f7b2f80bb87fcf5451d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b528e01d85e4e81f670f7b2f8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 18 14:04:56 2013 +0900 gdiplus: Reimplement GdipCloneImage using GdipCloneBitmapArea for a bitmap. --- dlls/gdiplus/image.c | 43 +++---------------------------------------- 1 files changed, 3 insertions(+), 40 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 83b0b08..b9e5b84 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1312,47 +1312,10 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) } else if (image->type == ImageTypeBitmap) { - GpBitmap *bitmap = (GpBitmap*)image; - BitmapData lockeddata_src, lockeddata_dst; - int i; - UINT row_size; + GpBitmap *bitmap = (GpBitmap *)image; - stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, bitmap->format, - &lockeddata_src); - if (stat != Ok) return stat; - - stat = GdipCreateBitmapFromScan0(lockeddata_src.Width, lockeddata_src.Height, - 0, lockeddata_src.PixelFormat, NULL, (GpBitmap**)cloneImage); - if (stat == Ok) - { - stat = GdipBitmapLockBits((GpBitmap*)*cloneImage, NULL, ImageLockModeWrite, - lockeddata_src.PixelFormat, &lockeddata_dst); - - if (stat == Ok) - { - /* copy the image data */ - row_size = (lockeddata_src.Width * PIXELFORMATBPP(lockeddata_src.PixelFormat) +7)/8; - for (i=0; i<lockeddata_src.Height; i++) - memcpy((BYTE*)lockeddata_dst.Scan0+lockeddata_dst.Stride*i, - (BYTE*)lockeddata_src.Scan0+lockeddata_src.Stride*i, - row_size); - - GdipBitmapUnlockBits((GpBitmap*)*cloneImage, &lockeddata_dst); - } - - if (stat != Ok) - GdipDisposeImage(*cloneImage); - } - - GdipBitmapUnlockBits(bitmap, &lockeddata_src); - - if (stat != Ok) - { - *cloneImage = NULL; - } - else memcpy(&(*cloneImage)->format, &image->format, sizeof(GUID)); - - return stat; + return GdipCloneBitmapAreaI(0, 0, bitmap->width, bitmap->height, + bitmap->format, bitmap, (GpBitmap **)cloneImage); } else if (image->type == ImageTypeMetafile && ((GpMetafile*)image)->hemf) {

1 0

Frédéric Delanoy : oleaut32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 3f91834ffb72a99defe86271f6a2b3ae4c7d621e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f91834ffb72a99defe86271f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 18 11:25:02 2013 +0200 oleaut32/tests: Use BOOL type where appropriate. --- dlls/oleaut32/tests/olefont.c | 38 +++++++++++++++++++------------------- dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/tests/vartest.c | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 2482554..9761778 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -77,9 +77,9 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, S(fd.cySize).Hi = hi_size; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; /* Create font, test that it worked. */ hres = pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj); @@ -539,9 +539,9 @@ static void test_IsEqual(void) S(fd.cySize).Hi = 100; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; /* Create font */ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt); @@ -604,30 +604,30 @@ static void test_IsEqual(void) IFont_Release(ifnt2); /* Test italic setting */ - fd.fItalic = 1; + fd.fItalic = TRUE; pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08x\n",hres); - fd.fItalic = 0; + fd.fItalic = FALSE; IFont_Release(ifnt2); /* Test underline setting */ - fd.fUnderline = 1; + fd.fUnderline = TRUE; pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08x\n",hres); - fd.fUnderline = 0; + fd.fUnderline = FALSE; IFont_Release(ifnt2); /* Test strikethrough setting */ - fd.fStrikethrough = 1; + fd.fStrikethrough = TRUE; pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08x\n",hres); - fd.fStrikethrough = 0; + fd.fStrikethrough = FALSE; IFont_Release(ifnt2); /* Free IFont. */ @@ -652,9 +652,9 @@ static void test_ReleaseHfont(void) S(fd.cySize).Hi = 100; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; /* Create HFONTs and IFONTs */ pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj1); @@ -722,9 +722,9 @@ static void test_AddRefHfont(void) S(fd.cySize).Hi = 100; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; /* Create HFONTs and IFONTs */ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt1); @@ -813,7 +813,7 @@ static void test_AddRefHfont(void) IFont_Release(ifnt2); /* Need to make a new IFONT for testing */ - fd.fUnderline = 1; + fd.fUnderline = TRUE; pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt3); IFont_get_hFont(ifnt3,&hfnt3); diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index c356ae0..9f6fa1f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -76,7 +76,7 @@ static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0 static WCHAR wszGUID[] = {'G','U','I','D',0}; static WCHAR wszguid[] = {'g','u','i','d',0}; -static const int is_win64 = sizeof(void *) > sizeof(int); +static const BOOL is_win64 = sizeof(void *) > sizeof(int); static HRESULT WINAPI invoketest_QueryInterface(IInvokeTest *iface, REFIID riid, void **ret) { diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 1ee3c4f..2840f47 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -381,9 +381,9 @@ static const VARTYPE ExtraFlags[16] = }; /* Determine if a vt is valid for VariantClear() */ -static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) +static BOOL IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) { - int ret = 0; + BOOL ret = FALSE; /* Only the following flags/types are valid */ if ((vt <= VT_LPWSTR || vt == VT_RECORD || vt == VT_CLSID) && @@ -392,10 +392,10 @@ static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) (!(extraFlags & (VT_BYREF|VT_ARRAY)) || vt > VT_NULL) && (extraFlags == 0 || extraFlags == VT_BYREF || extraFlags == VT_ARRAY || extraFlags == (VT_ARRAY|VT_BYREF))) - ret = 1; /* ok */ + ret = TRUE; /* ok */ if (!has_i8 && (vt == VT_I8 || vt == VT_UI8)) - ret = 0; /* Old versions of oleaut32 */ + ret = FALSE; /* Old versions of oleaut32 */ return ret; } @@ -681,15 +681,15 @@ static void test_VariantCopy(void) } /* Determine if a vt is valid for VariantCopyInd() */ -static int IsValidVariantCopyIndVT(VARTYPE vt, VARTYPE extraFlags) +static BOOL IsValidVariantCopyIndVT(VARTYPE vt, VARTYPE extraFlags) { - int ret = 0; + BOOL ret = FALSE; if ((extraFlags & VT_ARRAY) || (vt > VT_NULL && vt != (VARTYPE)15 && vt < VT_VOID && !(extraFlags & (VT_VECTOR|VT_RESERVED)))) { - ret = 1; /* ok */ + ret = TRUE; /* ok */ } return ret; } @@ -2875,7 +2875,7 @@ static void test_VarFix(void) for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { - HRESULT bFail = TRUE; + BOOL bFail = TRUE; SKIPTESTS(vt); @@ -2990,7 +2990,7 @@ static void test_VarInt(void) for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { - HRESULT bFail = TRUE; + BOOL bFail = TRUE; SKIPTESTS(vt); @@ -3111,7 +3111,7 @@ static void test_VarNeg(void) for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { - HRESULT bFail = TRUE; + BOOL bFail = TRUE; SKIPTESTS(vt);

1 0

Frédéric Delanoy : oleaut32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: f4dc64918e6629b877adf41f8153bdb50f4c72ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4dc64918e6629b877adf41f8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 18 11:25:00 2013 +0200 oleaut32: Use BOOL type where appropriate. --- dlls/oleaut32/olefont.c | 6 +++--- dlls/oleaut32/typelib.c | 9 +++++---- dlls/oleaut32/vartype.c | 28 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index b5c0cb4..c0925a2 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -353,9 +353,9 @@ HRESULT WINAPI OleCreateFontIndirect( fd.cySize.s.Hi = 0; fd.sWeight = 0; fd.sCharset = 0; - fd.fItalic = 0; - fd.fUnderline = 0; - fd.fStrikethrough = 0; + fd.fItalic = FALSE; + fd.fUnderline = FALSE; + fd.fStrikethrough = FALSE; lpFontDesc = &fd; } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a807eb3..07da928 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2407,7 +2407,7 @@ static void MSFT_GetTdesc(TLBContext *pcx, INT type, TYPEDESC *pTd) TRACE_(typelib)("vt type = %X\n", pTd->vt); } -static int TLB_is_propgetput(INVOKEKIND invkind) +static BOOL TLB_is_propgetput(INVOKEKIND invkind) { return (invkind == INVOKE_PROPERTYGET || invkind == INVOKE_PROPERTYPUT || @@ -5428,7 +5428,8 @@ static HRESULT WINAPI ITypeLibComp_fnBind( BINDPTR * pBindPtr) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - int typemismatch=0, i; + BOOL typemismatch = FALSE; + int i; TRACE("(%p)->(%s, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); @@ -5469,7 +5470,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( return S_OK; } else if (hr == TYPE_E_TYPEMISMATCH) - typemismatch = 1; + typemismatch = TRUE; } if ((pTypeInfo->typekind == TKIND_COCLASS) && @@ -5540,7 +5541,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( return S_OK; } else if (hr == TYPE_E_TYPEMISMATCH) - typemismatch = 1; + typemismatch = TRUE; } } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index e1672a1..d492e7d 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4682,10 +4682,10 @@ static unsigned char VARIANT_int_divbychar(DWORD * p, unsigned int n, unsigned c } /* check to test if encoded number is a zero. Returns 1 if zero, 0 for nonzero */ -static int VARIANT_int_iszero(const DWORD * p, unsigned int n) +static BOOL VARIANT_int_iszero(const DWORD * p, unsigned int n) { - for (; n > 0; n--) if (*p++ != 0) return 0; - return 1; + for (; n > 0; n--) if (*p++ != 0) return FALSE; + return TRUE; } /* multiply two DECIMALS, without changing either one, and place result in third @@ -4695,7 +4695,7 @@ static int VARIANT_int_iszero(const DWORD * p, unsigned int n) */ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI * result) { - int r_overflow = 0; + BOOL r_overflow = FALSE; DWORD running[6]; signed int mulstart; @@ -4786,12 +4786,12 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI } /* cast DECIMAL into string. Any scale should be handled properly. en_US locale is - hardcoded (period for decimal separator, dash as negative sign). Returns 0 for - success, nonzero if insufficient space in output buffer. + hardcoded (period for decimal separator, dash as negative sign). Returns TRUE for + success, FALSE if insufficient space in output buffer. */ -static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) +static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) { - int overflow = 0; + BOOL overflow = FALSE; DWORD quotient[3]; unsigned char remainder; unsigned int i; @@ -4802,7 +4802,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) *s++ = '-'; n--; } - else overflow = 1; + else overflow = TRUE; } /* prepare initial 0 */ @@ -4810,7 +4810,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) if (n >= 2) { s[0] = '0'; s[1] = '\0'; - } else overflow = 1; + } else overflow = TRUE; } i = 0; @@ -4818,7 +4818,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) while (!overflow && !VARIANT_int_iszero(quotient, sizeof(quotient) / sizeof(DWORD))) { remainder = VARIANT_int_divbychar(quotient, sizeof(quotient) / sizeof(DWORD), 10); if (i + 2 > n) { - overflow = 1; + overflow = TRUE; } else { s[i++] = '0' + remainder; s[i] = '\0'; @@ -4839,7 +4839,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) if (i <= a->scale) { unsigned int numzeroes = a->scale + 1 - i; if (i + 1 + numzeroes >= n) { - overflow = 1; + overflow = TRUE; } else { memmove(s + numzeroes, s, (i + 1) * sizeof(WCHAR)); i += numzeroes; @@ -4853,7 +4853,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) if (a->scale > 0) { unsigned int periodpos = i - a->scale; if (i + 2 >= n) { - overflow = 1; + overflow = TRUE; } else { memmove(s + periodpos + 1, s + periodpos, (i + 1 - periodpos) * sizeof(WCHAR)); s[periodpos] = '.'; i++; @@ -4865,7 +4865,7 @@ static int VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n) } } - return overflow; + return !overflow; } /* shift the bits of a DWORD array to the left. p[0] is assumed LSB */

1 0

Jacek Caban : crypt32: Use empty_store for new CRL contexts.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: c01a7084248ca1f71f2b6d1f0e235f115bf927f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01a7084248ca1f71f2b6d1f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:50:53 2013 +0200 crypt32: Use empty_store for new CRL contexts. --- dlls/crypt32/crl.c | 2 +- dlls/crypt32/tests/store.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index bf67a6b..4686e11 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -97,7 +97,7 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, crl->pbCrlEncoded = data; crl->cbCrlEncoded = cbCrlEncoded; crl->pCrlInfo = crlInfo; - crl->hCertStore = 0; + crl->hCertStore = &empty_store; } end: diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 5e99503..ea85dbf 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2530,6 +2530,7 @@ static DWORD countCRLsInStore(HCERTSTORE store) static void testEmptyStore(void) { const CERT_CONTEXT *cert, *cert2, *cert3; + const CRL_CONTEXT *crl; HCERTSTORE store; BOOL res; @@ -2586,6 +2587,13 @@ static void testEmptyStore(void) ok(!res && GetLastError() == E_UNEXPECTED, "CertCloseStore returned: %x(%x)\n", res, GetLastError()); CertFreeCertificateContext(cert2); + + crl = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL)); + ok(crl != NULL, "CertCreateCRLContext failed\n"); + ok(crl->hCertStore == cert->hCertStore, "unexpected hCertStore\n"); + + CertFreeCRLContext(crl); + CertFreeCertificateContext(cert); }

1 0

Jacek Caban : crypt32: Always return TRUE from CertFreeCTLContext.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 610c863e7531569771fdb3dfcbdd4d3057063451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610c863e7531569771fdb3dfc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:50:23 2013 +0200 crypt32: Always return TRUE from CertFreeCTLContext. --- dlls/crypt32/context.c | 6 +----- dlls/crypt32/crypt32_private.h | 4 +--- dlls/crypt32/ctl.c | 6 ++---- dlls/crypt32/tests/ctl.c | 12 ++++++++++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 4809eea..d836b6f 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -74,14 +74,11 @@ void Context_AddRef(context_t *context) TRACE("(%p) ref=%d\n", context, context->ref); } -BOOL Context_Release(context_t *context) +void Context_Release(context_t *context) { - BOOL ret = TRUE; - if (context->ref <= 0) { ERR("%p's ref count is %d\n", context, context->ref); - return FALSE; } if (InterlockedDecrement(&context->ref) == 0) { @@ -97,7 +94,6 @@ BOOL Context_Release(context_t *context) } else TRACE("%p's ref count is %d\n", context, context->ref); - return ret; } void Context_CopyProperties(const void *to, const void *from) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index dbb9ee5..50eb9e6 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -403,10 +403,8 @@ void Context_AddRef(context_t*) DECLSPEC_HIDDEN; /* Decrements context's ref count. If context is a link context, releases its * linked context as well. - * If a data context has its ref count reach 0, calls dataContextFree on it. - * Returns FALSE if the reference count is <= 0 when called. */ -BOOL Context_Release(context_t *context) DECLSPEC_HIDDEN; +void Context_Release(context_t *context) DECLSPEC_HIDDEN; /** * Context property list functions diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 3717b7d..1f95fdf 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -500,13 +500,11 @@ PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCTLContext) { - BOOL ret = TRUE; - TRACE("(%p)\n", pCTLContext); if (pCTLContext) - ret = Context_Release(&ctl_from_ptr(pCTLContext)->base); - return ret; + Context_Release(&ctl_from_ptr(pCTLContext)->base); + return TRUE; } DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index f292a4c..55bbc6e 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -190,6 +190,7 @@ static void testCreateCTL(void) static void testDupCTL(void) { PCCTL_CONTEXT context, dupContext; + BOOL res; context = CertDuplicateCTLContext(NULL); ok(context == NULL, "expected NULL\n"); @@ -198,8 +199,15 @@ static void testDupCTL(void) dupContext = CertDuplicateCTLContext(context); ok(dupContext != NULL, "expected a context\n"); ok(dupContext == context, "expected identical context addresses\n"); - CertFreeCTLContext(dupContext); - CertFreeCTLContext(context); + + res = CertFreeCTLContext(dupContext); + ok(res, "CertFreeCTLContext failed\n"); + + res = CertFreeCTLContext(context); + ok(res, "CertFreeCTLContext failed\n"); + + res = CertFreeCTLContext(NULL); + ok(res, "CertFreeCTLContext failed\n"); } static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID,

1 0

Jacek Caban : crypt32: Always return TRUE from CertFreeCRLContext.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 351314145f946dc0913a9fb35ea0de4ef5cba82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=351314145f946dc0913a9fb35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:50:12 2013 +0200 crypt32: Always return TRUE from CertFreeCRLContext. --- dlls/crypt32/crl.c | 6 ++---- dlls/crypt32/tests/crl.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 1fa8aa9..967231b 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -363,13 +363,11 @@ PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) BOOL WINAPI CertFreeCRLContext(PCCRL_CONTEXT pCrlContext) { - BOOL ret = TRUE; - TRACE("(%p)\n", pCrlContext); if (pCrlContext) - ret = Context_Release(&crl_from_ptr(pCrlContext)->base); - return ret; + Context_Release(&crl_from_ptr(pCrlContext)->base); + return TRUE; } DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext, diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 313ebb3..f39d02e 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -120,6 +120,7 @@ static void testCreateCRL(void) static void testDupCRL(void) { PCCRL_CONTEXT context, dupContext; + BOOL res; context = CertDuplicateCRLContext(NULL); ok(context == NULL, "expected NULL\n"); @@ -128,8 +129,15 @@ static void testDupCRL(void) dupContext = CertDuplicateCRLContext(context); ok(dupContext != NULL, "expected a context\n"); ok(dupContext == context, "expected identical context addresses\n"); - CertFreeCRLContext(dupContext); - CertFreeCRLContext(context); + + res = CertFreeCRLContext(dupContext); + ok(res, "CertFreeCRLContext failed\n"); + + res = CertFreeCRLContext(context); + ok(res, "CertFreeCRLContext failed\n"); + + res = CertFreeCRLContext(NULL); + ok(res, "CertFreeCRLContext failed\n"); } static void testAddCRL(void)

1 0

Ken Thomases : winemac: Restore app cursor settings when cursor moves back into an app window.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 1c049e5031ff6ca3dc2ee874493aa6e685e8e9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c049e5031ff6ca3dc2ee8744… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:45:52 2013 -0500 winemac: Restore app cursor settings when cursor moves back into an app window. The code had previously set the cursor back to the standard arrow and unhid it when it left all app windows. Now it restores the cursor image that the app set and re-hides it if necessary when it moves back over any app window. --- dlls/winemac.drv/cocoa_app.h | 3 ++ dlls/winemac.drv/cocoa_app.m | 80 ++++++++++++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index a398bf1..07a4bc8 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -73,7 +73,10 @@ enum { NSArray* cursorFrames; int cursorFrame; NSTimer* cursorTimer; + NSCursor* cursor; + BOOL cursorIsCurrent; BOOL cursorHidden; + BOOL clientWantsCursorHidden; BOOL clippingCursor; CGRect cursorClipRect; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 92e16ff..e888a50 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -80,6 +80,7 @@ int macdrv_err_on; @property (readwrite, copy, nonatomic) NSEvent* lastFlagsChanged; @property (copy, nonatomic) NSArray* cursorFrames; @property (retain, nonatomic) NSTimer* cursorTimer; +(a)property (retain, nonatomic) NSCursor* cursor; @property (retain, nonatomic) NSImage* applicationIcon; @property (readonly, nonatomic) BOOL inputSourceIsInputMethod; @property (retain, nonatomic) WineWindow* mouseCaptureWindow; @@ -96,7 +97,7 @@ int macdrv_err_on; @synthesize keyboardType, lastFlagsChanged; @synthesize applicationIcon; - @synthesize cursorFrames, cursorTimer; + @synthesize cursorFrames, cursorTimer, cursor; @synthesize mouseCaptureWindow; + (void) initialize @@ -172,6 +173,7 @@ int macdrv_err_on; - (void) dealloc { + [cursor release]; [screenFrameCGRects release]; [applicationIcon release]; [warpRecords release]; @@ -785,21 +787,69 @@ int macdrv_err_on; return ([originalDisplayModes count] > 0 || displaysCapturedForFullscreen); } + - (void) updateCursor + { + if (lastTargetWindow) + { + if (clientWantsCursorHidden && !cursorHidden) + { + [NSCursor hide]; + cursorHidden = TRUE; + } + + if (!cursorIsCurrent) + { + [cursor set]; + cursorIsCurrent = TRUE; + } + + if (!clientWantsCursorHidden && cursorHidden) + { + [NSCursor unhide]; + cursorHidden = FALSE; + } + } + else + { + if (cursorIsCurrent) + { + [[NSCursor arrowCursor] set]; + cursorIsCurrent = FALSE; + } + if (cursorHidden) + { + [NSCursor unhide]; + cursorHidden = FALSE; + } + } + } + - (void) hideCursor { - if (!cursorHidden) + if (!clientWantsCursorHidden) { - [NSCursor hide]; - cursorHidden = TRUE; + clientWantsCursorHidden = TRUE; + [self updateCursor]; } } - (void) unhideCursor { - if (cursorHidden) + if (clientWantsCursorHidden) { - [NSCursor unhide]; - cursorHidden = FALSE; + clientWantsCursorHidden = FALSE; + [self updateCursor]; + } + } + + - (void) setCursor:(NSCursor*)newCursor + { + if (newCursor != cursor) + { + [cursor release]; + cursor = [newCursor retain]; + cursorIsCurrent = FALSE; + [self updateCursor]; } } @@ -810,15 +860,12 @@ int macdrv_err_on; NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize]; CFDictionaryRef hotSpotDict = (CFDictionaryRef)[frame objectForKey:@"hotSpot"]; CGPoint hotSpot; - NSCursor* cursor; if (!CGPointMakeWithDictionaryRepresentation(hotSpotDict, &hotSpot)) hotSpot = CGPointZero; - cursor = [[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)]; + self.cursor = [[[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)] autorelease]; [image release]; - [cursor set]; [self unhideCursor]; - [cursor release]; } - (void) nextCursorFrame:(NSTimer*)theTimer @@ -1466,12 +1513,10 @@ int macdrv_err_on; lastTargetWindow = targetWindow; } - else if (lastTargetWindow) - { - [[NSCursor arrowCursor] set]; - [self unhideCursor]; + else lastTargetWindow = nil; - } + + [self updateCursor]; } - (void) handleMouseButton:(NSEvent*)theEvent @@ -2247,9 +2292,8 @@ void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) { OnMainThreadAsync(^{ WineApplicationController* controller = [WineApplicationController sharedController]; - NSCursor* cursor = [NSCursor performSelector:sel]; [controller setCursorWithFrames:nil]; - [cursor set]; + controller.cursor = [NSCursor performSelector:sel]; [controller unhideCursor]; }); }

1 0

Ken Thomases : winemac: Clean up fully-delivered events in queues which aren't being drained.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 761092a2fec5dea6dcbceff5d8dd022f8b1925d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761092a2fec5dea6dcbceff5d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:43:49 2013 -0500 winemac: Clean up fully-delivered events in queues which aren't being drained. Some events get queued for all GUI-connected threads but are only processed by the first to dequeue them. Other threads which tend their event queue discard such already-processed events. However, some threads may be connected to the GUI but never tend their event queue. To prevent such threads from accumulating zombie events, the zombies are cleared each time a new event is queued. --- dlls/winemac.drv/cocoa_event.m | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index faeb033..3b35576 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -171,10 +171,16 @@ static const OSType WineHotKeySignature = 'Wine'; - (void) postEventObject:(MacDrvEvent*)event { + NSIndexSet* indexes; MacDrvEvent* lastEvent; [eventsLock lock]; + indexes = [events indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop){ + return ((MacDrvEvent*)obj)->event->deliver <= 0; + }]; + [events removeObjectsAtIndexes:indexes]; + if ((event->event->type == MOUSE_MOVED || event->event->type == MOUSE_MOVED_ABSOLUTE) && event->event->deliver == INT_MAX &&

1 0