wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Detlef Riekenberg : browseui/tests: Add tests for IProgressDialog.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 518e05cb337324b032cc0b6845f42d33ebc4613f URL: http://source.winehq.org/git/wine.git/?a=commit;h=518e05cb337324b032cc0b684… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 16 23:16:18 2012 +0200 browseui/tests: Add tests for IProgressDialog. --- dlls/browseui/tests/Makefile.in | 3 +- dlls/browseui/tests/progressdlg.c | 72 +++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in index 0cb3541..c3bc768 100644 --- a/dlls/browseui/tests/Makefile.in +++ b/dlls/browseui/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = browseui.dll IMPORTS = ole32 C_SRCS = \ - autocomplete.c + autocomplete.c \ + progressdlg.c @MAKE_TEST_RULES@ diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c new file mode 100644 index 0000000..e4d0e2f --- /dev/null +++ b/dlls/browseui/tests/progressdlg.c @@ -0,0 +1,72 @@ +/* Unit tests for progressdialog object + * + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <shlobj.h> + +#include "wine/test.h" + + +static void test_IProgressDialog_QueryInterface(void) +{ + IProgressDialog *dlg; + IProgressDialog *dlg2; + IOleWindow *olewindow; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void*)&dlg); + if (FAILED(hr)) { + win_skip("CoCreateInstance for IProgressDialog returned 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + + hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); + ok(hr == S_OK, "QueryInterface (IOleWindow) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + hr = IUnknown_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); + ok(hr == S_OK, "QueryInterface (IProgressDialog) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IProgressDialog_Release(dlg2); + } + IOleWindow_Release(olewindow); + } + IProgressDialog_Release(dlg); +} + + +START_TEST(progressdlg) +{ + CoInitialize(NULL); + + test_IProgressDialog_QueryInterface(); + + CoUninitialize(); +}

1 0

Detlef Riekenberg : browseui: Add IOleWindow to IProgressDialog.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 744acc1ddd8119560ff97e9c68ffda3e10ca2ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=744acc1ddd8119560ff97e9c6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 16 23:16:17 2012 +0200 browseui: Add IOleWindow to IProgressDialog. --- dlls/browseui/progressdlg.c | 66 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 9b970e2..5526854 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -60,6 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); typedef struct tagProgressDialog { IProgressDialog IProgressDialog_iface; + IOleWindow IOleWindow_iface; LONG refCount; CRITICAL_SECTION cs; HWND hwnd; @@ -79,6 +80,11 @@ static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface) return CONTAINING_RECORD(iface, ProgressDialog, IProgressDialog_iface); } +static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface); +} + static void set_buffer(LPWSTR *buffer, LPCWSTR string) { static const WCHAR empty_string[] = {0}; @@ -268,11 +274,19 @@ static void ProgressDialog_Destructor(ProgressDialog *This) static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFIID iid, LPVOID *ppvOut) { ProgressDialog *This = impl_from_IProgressDialog(iface); - *ppvOut = NULL; + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), ppvOut); + if (!ppvOut) + return E_POINTER; + + *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IProgressDialog)) { - *ppvOut = This; + *ppvOut = iface; + } + else if (IsEqualIID(iid, &IID_IOleWindow)) + { + *ppvOut = &This->IOleWindow_iface; } if (*ppvOut) @@ -495,6 +509,53 @@ static const IProgressDialogVtbl ProgressDialogVtbl = ProgressDialog_Timer }; +static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID iid, LPVOID *ppvOut) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_QueryInterface(&This->IProgressDialog_iface, iid, ppvOut); +} + +static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_AddRef(&This->IProgressDialog_iface); +} + +static ULONG WINAPI OleWindow_Release(IOleWindow *iface) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_Release(&This->IProgressDialog_iface); +} + +static HRESULT WINAPI OleWindow_GetWindow(IOleWindow* iface, HWND* phwnd) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + + TRACE("(%p, %p)\n", This, phwnd); + EnterCriticalSection(&This->cs); + *phwnd = This->hwnd; + LeaveCriticalSection(&This->cs); + return S_OK; +} + +static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow* iface, BOOL fEnterMode) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + + FIXME("(%p, %d): stub\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl OleWindowVtbl = +{ + OleWindow_QueryInterface, + OleWindow_AddRef, + OleWindow_Release, + OleWindow_GetWindow, + OleWindow_ContextSensitiveHelp +}; + + HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ProgressDialog *This; @@ -506,6 +567,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) return E_OUTOFMEMORY; This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; + This->IOleWindow_iface.lpVtbl = &OleWindowVtbl; This->refCount = 1; InitializeCriticalSection(&This->cs); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs");

1 0

Piotr Caban : wininet: Use the same hashing function as native does.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 9d68333f783b5a99a4c0d3bebd1011375919c2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d68333f783b5a99a4c0d3beb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 13:26:33 2012 +0200 wininet: Use the same hashing function as native does. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 81b9fda..e958d00 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -77,7 +77,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_LOCK 2 #define HASHTABLE_FREE 3 #define HASHTABLE_REDR 5 -#define HASHTABLE_FLAG_BITS 4 +#define HASHTABLE_FLAG_BITS 5 #define DWORD_SIG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) #define URL_SIGNATURE DWORD_SIG('U','R','L',' ') @@ -1228,7 +1228,7 @@ static DWORD URLCache_HashKey(LPCSTR lpszKey) DWORD i; for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) - key[i] = lookupTable[i]; + key[i] = lookupTable[(*lpszKey + i) & 0xFF]; for (lpszKey++; *lpszKey && ((lpszKey[0] != '/') || (lpszKey[1] != 0)); lpszKey++) {

1 0

Piotr Caban : jscript: Added Number.toPrecision implementation.
by Alexandre Julliard 19 Apr '12

19 Apr '12

1 0

Piotr Caban : jscript: Added Number.toExponential implementation.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: c1228eb45f5e390862b6521324bd8f2b62ff2c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1228eb45f5e390862b652132… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 15:28:59 2012 +0200 jscript: Added Number.toExponential implementation. --- dlls/jscript/number.c | 107 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 15 ++++++ 2 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 417e9ce..e1ff50c 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -150,6 +150,70 @@ static inline void number_to_fixed(double val, int prec, BSTR *out) *out = str; } +static inline void number_to_exponential(double val, int prec, BSTR *out) +{ + WCHAR buf[NUMBER_DTOA_SIZE], *pbuf; + int dec_point, size, buf_size, exp_size = 1; + BOOL neg = FALSE; + BSTR str; + + if(val < 0) { + neg = TRUE; + val = -val; + } + + buf_size = prec+2; + if(buf_size<2 || buf_size>NUMBER_DTOA_SIZE) + buf_size = NUMBER_DTOA_SIZE; + dtoa(val, buf, buf_size, &dec_point); + buf_size--; + if(prec == -1) + for(; buf_size>1 && buf[buf_size-1]=='0'; buf_size--) + buf[buf_size-1] = 0; + + size = 10; + while(dec_point>=size || dec_point<=-size) { + size *= 10; + exp_size++; + } + + if(buf_size == 1) + size = buf_size+2+exp_size; /* 2 = strlen(e+) */ + else if(prec == -1) + size = buf_size+3+exp_size; /* 3 = strlen(.e+) */ + else + size = prec+4+exp_size; /* 4 = strlen(0.e+) */ + if(neg) + size++; + str = SysAllocStringLen(NULL, size); + + size = 0; + pbuf = buf; + if(neg) + str[size++] = '-'; + str[size++] = *pbuf++; + if(buf_size != 1) { + str[size++] = '.'; + while(*pbuf) + str[size++] = *pbuf++; + for(; prec>buf_size-1; prec--) + str[size++] = '0'; + } + str[size++] = 'e'; + if(dec_point >= 0) { + str[size++] = '+'; + }else { + str[size++] = '-'; + dec_point = -dec_point; + } + for(str[size]='0', size+=exp_size-1; dec_point>0; dec_point/=10) + str[size--] = '0'+dec_point%10; + size += exp_size+1; + str[size] = 0; + + *out = str; +} + /* ECMA-262 3rd Edition 15.7.4.2 */ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) @@ -330,8 +394,47 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { - FIXME("\n"); - return E_NOTIMPL; + NumberInstance *number; + DOUBLE val; + INT prec = 0; + BSTR str; + HRESULT hres; + + TRACE("\n"); + + if(!(number = number_this(jsthis))) + return throw_type_error(ctx, ei, JS_E_NUMBER_EXPECTED, NULL); + + if(arg_cnt(dp)) { + hres = to_int32(ctx, get_arg(dp, 0), ei, &prec); + if(FAILED(hres)) + return hres; + + if(prec<0 || prec>20) + return throw_range_error(ctx, ei, JS_E_FRACTION_DIGITS_OUT_OF_RANGE, NULL); + } + + val = number->value; + if(isinf(val) || isnan(val)) { + VARIANT v; + + num_set_val(&v, val); + hres = to_string(ctx, &v, ei, &str); + if(FAILED(hres)) + return hres; + }else { + if(!prec) + prec--; + number_to_exponential(val, prec, &str); + } + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + }else { + SysFreeString(str); + } + return S_OK; } static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 70b28ef..a0e23fb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1046,6 +1046,21 @@ ok(tmp === "Infinity", "num(1000000000000000128) = " + tmp); tmp = (new Number(0.12345678901234567890123)).toFixed(20); ok(tmp === "0.12345678901234568000", "num(0.12345678901234567890123) = " + tmp); +tmp = (new Number(2)).toExponential(3); +ok(tmp === "2.000e+0", "num(2).toExponential(3) = " + tmp); +tmp = (new Number(1.17e-32)).toExponential(20); +ok(tmp === "1.17000000000000000000e-32", "num(1.17e-32).toExponential(20) = " + tmp); +tmp = (new Number(0)).toExponential(7); +ok(tmp === "0.0000000e+0", "num(0).toExponential(7) = " + tmp); +tmp = (new Number(0)).toExponential(0); +ok(tmp === "0e+0", "num(0).toExponential() = " + tmp); +tmp = (new Number(-13.7567)).toExponential(); +ok(tmp === "-1.37567e+1", "num(-13.7567).toExponential() = " + tmp); +tmp = (new Number(-32.1)).toExponential(); +ok(tmp === "-3.21e+1", "num(-32.1).toExponential() = " + tmp); +tmp = (new Number(4723.4235)).toExponential(); +ok(tmp === "4.7234235e+3", "num(4723.4235).toExponential() = " + tmp); + ok(Number() === 0, "Number() = " + Number()); ok(Number(false) === 0, "Number(false) = " + Number(false)); ok(Number("43") === 43, "Number('43') = " + Number("43"));

1 0

Piotr Caban : jscript: Added Number.toFixed implementation.
by Alexandre Julliard 19 Apr '12

19 Apr '12

1 0

Piotr Caban : jscript: Make parsing of double more accurate.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: b81e44f8d975013a1039772fcfb228488335ff55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81e44f8d975013a1039772fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 15:28:30 2012 +0200 jscript: Make parsing of double more accurate. --- dlls/jscript/global.c | 4 +++- dlls/jscript/lex.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 13b2cc9..92c70bc 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -621,7 +621,9 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag } V_VT(retv) = VT_R8; - V_R8(retv) = (double)(positive?d:-d)*pow(10, exp); + if(!positive) + d = -d; + V_R8(retv) = (exp>0 ? d*pow(10, exp) : d/pow(10, -exp)); return S_OK; } diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 3bb2814..42e482f 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -474,7 +474,7 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li else exp += e; } - *literal = new_double_literal(ctx, (DOUBLE)d*pow(10, exp)); + *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); return tNumericLiteral; }

1 0

Aric Stewart : quartz: Correct a critical section lock reversal issue found by Marcus Meissner ( Coverity).
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 6aafd2f1dedfe286e75892bef866d89150c12377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aafd2f1dedfe286e75892bef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 19 08:11:12 2012 -0500 quartz: Correct a critical section lock reversal issue found by Marcus Meissner (Coverity). --- dlls/quartz/videorenderer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e1e9628..27c656c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -368,11 +368,11 @@ static HRESULT WINAPI VideoRenderer_EndFlush(BaseRenderer* iface) if (This->renderer.pMediaSample) { ResetEvent(This->hEvent); LeaveCriticalSection(iface->pInputPin->pin.pCritSec); - LeaveCriticalSection(&iface->filter.csFilter); LeaveCriticalSection(&iface->csRenderLock); + LeaveCriticalSection(&iface->filter.csFilter); WaitForSingleObject(This->hEvent, INFINITE); - EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(&iface->filter.csFilter); + EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(iface->pInputPin->pin.pCritSec); } if (This->renderer.filter.state == State_Paused) {

1 0

Dmitry Timoshkov : gdiplus: Use StretchBlt instead of GdiAlphaBlend if device doesn' t support alpha blending.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 600cbb78743fceb2f8abf29ebf23aa0ea97254a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=600cbb78743fceb2f8abf29eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 13 14:03:49 2012 +0900 gdiplus: Use StretchBlt instead of GdiAlphaBlend if device doesn't support alpha blending. --- dlls/gdiplus/graphics.c | 63 ++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2c6c4b2..0845579 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -340,6 +340,30 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, } } +static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, + HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) +{ + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + { + TRACE("alpha blending not supported by device, fallback to StretchBlt\n"); + + StretchBlt(graphics->hdc, dst_x, dst_y, dst_width, dst_height, + hdc, src_x, src_y, src_width, src_height, SRCCOPY); + } + else + { + BLENDFUNCTION bf; + + bf.BlendOp = AC_SRC_OVER; + bf.BlendFlags = 0; + bf.SourceConstantAlpha = 255; + bf.AlphaFormat = AC_SRC_ALPHA; + + GdiAlphaBlend(graphics->hdc, dst_x, dst_y, dst_width, dst_height, + hdc, src_x, src_y, src_width, src_height, bf); + } +} + /* Draw non-premultiplied ARGB data to the given graphics object */ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, const BYTE *src, INT src_width, INT src_height, INT src_stride) @@ -370,10 +394,9 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, else { HDC hdc; - HBITMAP hbitmap, old_hbm=NULL; + HBITMAP hbitmap; BITMAPINFOHEADER bih; BYTE *temp_bits; - BLENDFUNCTION bf; hdc = CreateCompatibleDC(0); @@ -395,17 +418,9 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, 4 * src_width, src, src_stride); - old_hbm = SelectObject(hdc, hbitmap); - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, dst_x, dst_y, src_width, src_height, - hdc, 0, 0, src_width, src_height, bf); - - SelectObject(hdc, old_hbm); + SelectObject(hdc, hbitmap); + gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, + hdc, 0, 0, src_width, src_height); DeleteDC(hdc); DeleteObject(hbitmap); @@ -918,19 +933,12 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); - BLENDFUNCTION bf; if (!hdc) break; SelectObject(hdc, bmp); - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, hdc, 0, 0, 1, 1, bf); - + gdi_alpha_blend(graphics, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + hdc, 0, 0, 1, 1); DeleteDC(hdc); } @@ -3288,15 +3296,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) { - BLENDFUNCTION bf; - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, - hdc, srcx, srcy, srcwidth, srcheight, bf); + gdi_alpha_blend(graphics, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, + hdc, srcx, srcy, srcwidth, srcheight); } else {

1 0

Alexandre Julliard : user32: Don' t invalidate DCEs for sibling top-level windows since they are not clipped.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 1dba866e6175d5de4a33a81b26c415a646484e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dba866e6175d5de4a33a81b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 16:34:37 2012 +0200 user32: Don't invalidate DCEs for sibling top-level windows since they are not clipped. --- dlls/user32/painting.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index c3a25fb..60252c6 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -425,18 +425,17 @@ void invalidate_dce( HWND hwnd, const RECT *extra_rect ) if (dce->hwnd == hwnd || IsChild( hwnd, dce->hwnd )) { make_dc_dirty( dce ); + continue; } - else /* otherwise check if the window rectangle intersects this DCE window */ + + /* otherwise check if the window rectangle intersects this DCE window */ + if (hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) { - if (hwndScope == GetDesktopWindow() || - hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) - { - RECT dce_rect, tmp; - GetWindowRect( dce->hwnd, &dce_rect ); - if (IntersectRect( &tmp, &dce_rect, &window_rect ) || - (extra_rect && IntersectRect( &tmp, &dce_rect, extra_rect ))) - make_dc_dirty( dce ); - } + RECT dce_rect, tmp; + GetWindowRect( dce->hwnd, &dce_rect ); + if (IntersectRect( &tmp, &dce_rect, &window_rect ) || + (extra_rect && IntersectRect( &tmp, &dce_rect, extra_rect ))) + make_dc_dirty( dce ); } } USER_Unlock();

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012