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

Aric Stewart : msctf: Beginning implementation of ITfContext::GetSelection.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 13d6aa2bb72d9d90e239d6e3001948ed0e2f9be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d6aa2bb72d9d90e239d6e30… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 21 13:45:57 2009 -0500 msctf: Beginning implementation of ITfContext::GetSelection. --- dlls/msctf/context.c | 55 +++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 23 +++++++++++++++- include/textstor.idl | 2 + 3 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 8c83798..8e14a72 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -283,8 +283,59 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, TF_SELECTION *pSelection, ULONG *pcFetched) { Context *This = (Context *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + EditCookie *cookie; + ULONG count, i; + ULONG totalFetched = 0; + HRESULT hr = S_OK; + + if (!pSelection || !pcFetched) + return E_INVALIDARG; + + *pcFetched = 0; + + if (!This->connected) + return TF_E_DISCONNECTED; + + if (get_Cookie_magic(ec)!=COOKIE_MAGIC_EDITCOOKIE) + return TF_E_NOLOCK; + + if (!This->pITextStoreACP) + { + FIXME("Context does not have a ITextStoreACP\n"); + return E_NOTIMPL; + } + + cookie = get_Cookie_data(ec); + + if (ulIndex == TF_DEFAULT_SELECTION) + count = 1; + else + count = ulCount; + + for (i = 0; i < count; i++) + { + DWORD fetched; + TS_SELECTION_ACP acps; + + hr = ITextStoreACP_GetSelection(This->pITextStoreACP, ulIndex + i, + 1, &acps, &fetched); + + if (hr == TS_E_NOLOCK) + return TF_E_NOLOCK; + else if (SUCCEEDED(hr)) + { + pSelection[totalFetched].style.ase = acps.style.ase; + pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar; + Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); + totalFetched ++; + } + else + break; + } + + *pcFetched = totalFetched; + + return hr; } static HRESULT WINAPI Context_SetSelection (ITfContext *iface, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f488e82..5884a30 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -58,6 +58,7 @@ static INT test_ACP_AdviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; +static INT test_ACP_GetSelection = SINK_UNEXPECTED; static INT test_DoEditSession = SINK_UNEXPECTED; @@ -171,7 +172,15 @@ static HRESULT WINAPI TextStoreACP_QueryInsert(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_GetSelection(ITextStoreACP *iface, ULONG ulIndex, ULONG ulCount, TS_SELECTION_ACP *pSelection, ULONG *pcFetched) { - trace("\n"); + ok(test_ACP_GetSelection == SINK_EXPECTED, "Unexpected TextStoreACP_GetSelection\n"); + test_ACP_GetSelection = SINK_FIRED; + + pSelection->acpStart = 10; + pSelection->acpEnd = 20; + pSelection->style.fInterimChar = 0; + pSelection->style.ase = TS_AE_NONE; + *pcFetched = 1; + return S_OK; } static HRESULT WINAPI TextStoreACP_SetSelection(ITextStoreACP *iface, @@ -1378,6 +1387,8 @@ TfEditCookie ec) ITfContext *cxt; ITfDocumentMgr *dm; ITfRange *range; + TF_SELECTION selection; + ULONG fetched; HRESULT hr; ok(test_DoEditSession == SINK_EXPECTED, "Unexpected DoEditSession\n"); @@ -1416,6 +1427,16 @@ TfEditCookie ec) ok(test_ACP_GetEndACP == SINK_FIRED, "GetEndACP not fired as expected\n"); ITfRange_Release(range); + + selection.range = NULL; + test_ACP_GetSelection = SINK_EXPECTED; + hr = ITfContext_GetSelection(cxt, ec, TF_DEFAULT_SELECTION, 1, &selection, &fetched); + ok(SUCCEEDED(hr),"ITfContext_GetSelection failed\n"); + ok(fetched == 1,"fetched incorrect\n"); + ok(selection.range != NULL,"NULL range\n"); + ok(test_ACP_GetSelection == SINK_FIRED," expected ACP_GetSepection not fired\n"); + ITfRange_Release(selection.range); + ITfContext_Release(cxt); ITfDocumentMgr_Release(dm); return 0xdeadcafe; diff --git a/include/textstor.idl b/include/textstor.idl index 262dc53..2e79e3c 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -21,6 +21,8 @@ import "oaidl.idl"; #endif cpp_quote("#define TS_E_READONLY MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0209)") +cpp_quote("#define TS_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") + const ULONG TS_DEFAULT_SELECTION = ~0u;

1 0

Austin English : ntdll: Change a noisy FIXME to a WARN.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 81543b79c21a8c9c9761294fc31ab6ce1348a66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=81543b79c21a8c9c9761294fc… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 21 15:07:02 2009 -0500 ntdll: Change a noisy FIXME to a WARN. --- dlls/ntdll/nt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 58320c3..323e7e6 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1307,7 +1307,8 @@ NTSTATUS WINAPI NtPowerInformation( return STATUS_SUCCESS; } default: - FIXME("Unimplemented NtPowerInformation action: %d\n", InformationLevel); + /* FIXME: Needed by .NET Framework */ + WARN("Unimplemented NtPowerInformation action: %d\n", InformationLevel); return STATUS_NOT_IMPLEMENTED; } }

1 0

Austin English : powerprof: Remove a noisy FIXME.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: d4c880dfe4e8a1c547ef32fa1d52d6ead214fa76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c880dfe4e8a1c547ef32fa1… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 21 15:08:02 2009 -0500 powerprof: Remove a noisy FIXME. --- dlls/powrprof/powrprof.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index c51434f..507b380 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -299,8 +299,6 @@ BOOLEAN WINAPI WritePwrScheme(PUINT puiID, LPWSTR lpszName, LPWSTR lpszDescripti BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - FIXME("(%p, %d, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); - switch(fdwReason) { case DLL_PROCESS_ATTACH: {

1 0

Huw Davies : ole32: Fix remote HMETAFILEPICT marshalling on 64 bit systems.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: ed09de1e6fbd355148f8de21dcf400b4af2fa602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed09de1e6fbd355148f8de21d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 21 12:16:20 2009 +0100 ole32: Fix remote HMETAFILEPICT marshalling on 64 bit systems. --- dlls/ole32/usrmarshal.c | 121 +++++++++++++++++++++++++++-------------------- 1 files changed, 70 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 1337a39..98e0691 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1378,19 +1378,25 @@ ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *pFlags, ULONG StartingSize, HMETA TRACE("(%s, %d, &%p)\n", debugstr_user_flags(pFlags), StartingSize, *phMfp); size += sizeof(ULONG); - size += sizeof(HMETAFILEPICT); - if ((LOWORD(*pFlags) != MSHCTX_INPROC) && *phMfp) + if(LOWORD(*pFlags) == MSHCTX_INPROC) + size += sizeof(HMETAFILEPICT); + else { - METAFILEPICT *mfpict = GlobalLock(*phMfp); - - /* FIXME: raise an exception if mfpict is NULL? */ - size += FIELD_OFFSET(remoteMETAFILEPICT, hMF); size += sizeof(ULONG); - size = HMETAFILE_UserSize(pFlags, size, &mfpict->hMF); + if (*phMfp) + { + METAFILEPICT *mfpict = GlobalLock(*phMfp); - GlobalUnlock(*phMfp); + /* FIXME: raise an exception if mfpict is NULL? */ + size += FIELD_OFFSET(remoteMETAFILEPICT, hMF); + size += sizeof(ULONG); + + size = HMETAFILE_UserSize(pFlags, size, &mfpict->hMF); + + GlobalUnlock(*phMfp); + } } return size; @@ -1420,32 +1426,40 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal(ULONG *pFlags, unsigned cha TRACE("(%s, %p, &%p)\n", debugstr_user_flags(pFlags), pBuffer, *phMfp); if (LOWORD(*pFlags) == MSHCTX_INPROC) - *(ULONG *)pBuffer = WDT_INPROC_CALL; + { + if (sizeof(HMETAFILEPICT) == 8) + *(ULONG *)pBuffer = WDT_INPROC64_CALL; + else + *(ULONG *)pBuffer = WDT_INPROC_CALL; + pBuffer += sizeof(ULONG); + *(HMETAFILEPICT *)pBuffer = *phMfp; + pBuffer += sizeof(HMETAFILEPICT); + } else - *(ULONG *)pBuffer = WDT_REMOTE_CALL; - pBuffer += sizeof(ULONG); - - *(HMETAFILEPICT *)pBuffer = *phMfp; - pBuffer += sizeof(HMETAFILEPICT); - - if ((LOWORD(*pFlags) != MSHCTX_INPROC) && *phMfp) { - METAFILEPICT *mfpict = GlobalLock(*phMfp); - remoteMETAFILEPICT * remmfpict = (remoteMETAFILEPICT *)pBuffer; - - /* FIXME: raise an exception if mfpict is NULL? */ - remmfpict->mm = mfpict->mm; - remmfpict->xExt = mfpict->xExt; - remmfpict->yExt = mfpict->yExt; - pBuffer += FIELD_OFFSET(remoteMETAFILEPICT, hMF); - *(ULONG *)pBuffer = USER_MARSHAL_PTR_PREFIX; + *(ULONG *)pBuffer = WDT_REMOTE_CALL; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = (ULONG)(ULONG_PTR)*phMfp; pBuffer += sizeof(ULONG); - pBuffer = HMETAFILE_UserMarshal(pFlags, pBuffer, &mfpict->hMF); + if (*phMfp) + { + METAFILEPICT *mfpict = GlobalLock(*phMfp); + remoteMETAFILEPICT * remmfpict = (remoteMETAFILEPICT *)pBuffer; + + /* FIXME: raise an exception if mfpict is NULL? */ + remmfpict->mm = mfpict->mm; + remmfpict->xExt = mfpict->xExt; + remmfpict->yExt = mfpict->yExt; + pBuffer += FIELD_OFFSET(remoteMETAFILEPICT, hMF); + *(ULONG *)pBuffer = USER_MARSHAL_PTR_PREFIX; + pBuffer += sizeof(ULONG); - GlobalUnlock(*phMfp); - } + pBuffer = HMETAFILE_UserMarshal(pFlags, pBuffer, &mfpict->hMF); + GlobalUnlock(*phMfp); + } + } return pBuffer; } @@ -1477,40 +1491,45 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *pFlags, unsigned c fContext = *(ULONG *)pBuffer; pBuffer += sizeof(ULONG); - if ((fContext == WDT_INPROC_CALL) || !*(HMETAFILEPICT *)pBuffer) + if ((fContext == WDT_INPROC_CALL) || fContext == WDT_INPROC64_CALL) { *phMfp = *(HMETAFILEPICT *)pBuffer; pBuffer += sizeof(HMETAFILEPICT); } else { - METAFILEPICT *mfpict; - const remoteMETAFILEPICT *remmfpict; - ULONG user_marshal_prefix; - - pBuffer += sizeof(HMETAFILEPICT); - remmfpict = (const remoteMETAFILEPICT *)pBuffer; - - *phMfp = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); - if (!*phMfp) - RpcRaiseException(E_OUTOFMEMORY); - - mfpict = GlobalLock(*phMfp); - mfpict->mm = remmfpict->mm; - mfpict->xExt = remmfpict->xExt; - mfpict->yExt = remmfpict->yExt; - pBuffer += FIELD_OFFSET(remoteMETAFILEPICT, hMF); - user_marshal_prefix = *(ULONG *)pBuffer; + ULONG handle = *(ULONG *)pBuffer; pBuffer += sizeof(ULONG); + *phMfp = NULL; + + if(handle) + { + METAFILEPICT *mfpict; + const remoteMETAFILEPICT *remmfpict; + ULONG user_marshal_prefix; + + remmfpict = (const remoteMETAFILEPICT *)pBuffer; + + *phMfp = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + if (!*phMfp) + RpcRaiseException(E_OUTOFMEMORY); + + mfpict = GlobalLock(*phMfp); + mfpict->mm = remmfpict->mm; + mfpict->xExt = remmfpict->xExt; + mfpict->yExt = remmfpict->yExt; + pBuffer += FIELD_OFFSET(remoteMETAFILEPICT, hMF); + user_marshal_prefix = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); - if (user_marshal_prefix != USER_MARSHAL_PTR_PREFIX) - RpcRaiseException(RPC_X_INVALID_TAG); + if (user_marshal_prefix != USER_MARSHAL_PTR_PREFIX) + RpcRaiseException(RPC_X_INVALID_TAG); - pBuffer = HMETAFILE_UserUnmarshal(pFlags, pBuffer, &mfpict->hMF); + pBuffer = HMETAFILE_UserUnmarshal(pFlags, pBuffer, &mfpict->hMF); - GlobalUnlock(*phMfp); + GlobalUnlock(*phMfp); + } } - return pBuffer; }

1 0

Nikolay Sivov : comctl32/listview: Update focus rectangle properly.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: 1394c6eee3150c2ecf588a25eed6d329adc91950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1394c6eee3150c2ecf588a25e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu May 21 15:55:47 2009 +0400 comctl32/listview: Update focus rectangle properly. --- dlls/comctl32/listview.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6e3509a..8ddaf3d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3974,7 +3974,8 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS if (nmlvcd.clrTextBk != CLR_NONE) ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, 0, 0, 0); - if(lprcFocus) *lprcFocus = rcSelect; + /* store new focus rectangle */ + if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect; } /* figure out the text drawing flags */

1 0

Stefan Dösinger : wined3d: Implement SGN in ARB.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: 122af07a3034ddd2e0e74d9166df442a0e263e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=122af07a3034ddd2e0e74d916… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 8 18:17:03 2009 +0200 wined3d: Implement SGN in ARB. --- dlls/wined3d/arb_program_shader.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 79c3b95..7e3abdf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1038,6 +1038,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_SLT: instruction = "SLT"; break; case WINED3DSIH_SUB: instruction = "SUB"; break; case WINED3DSIH_MOVA:instruction = "ARR"; break; + case WINED3DSIH_SGN: instruction = "SSG"; break; default: instruction = ""; FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; @@ -1726,6 +1727,34 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) } /* GL locking is done by the caller */ +static void shader_hw_sgn(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + char dst_name[50]; + char src_name[50]; + struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; + + /* SGN is only valid in vertex shaders */ + if(ctx->target_version == NV2) { + shader_hw_map2gl(ins); + return; + } + shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); + shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); + + FIXME("Emulated SGN untested\n"); + /* If SRC > 0.0, -SRC < SRC = TRUE, otherwise false. + * if SRC < 0.0, SRC < -SRC = TRUE. If neither is true, src = 0.0 + */ + if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) { + shader_addline(buffer, "SLT %s, -%s, %s;\n", dst_name, src_name, src_name); + } else { + shader_addline(buffer, "SLT TB, -%s, %s;\n", src_name, src_name); + shader_addline(buffer, "SLT TC, %s, -%s;\n", src_name, src_name); + shader_addline(buffer, "ADD %s, TB, -TC;\n", dst_name); + } +} + static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) { GLuint program_id = 0; @@ -2363,7 +2392,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RSQ */ shader_hw_rsq_rcp, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, - /* WINED3DSIH_SGN */ NULL, + /* WINED3DSIH_SGN */ shader_hw_sgn, /* WINED3DSIH_SINCOS */ shader_hw_sincos, /* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SUB */ shader_hw_map2gl,

1 0

Vincent Povirk : gdiplus: Implement partially transparent solid fill brushes.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: 60167dfb74f3514e888a9afa9958d2aa857915e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60167dfb74f3514e888a9afa9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 20 11:24:18 2009 -0500 gdiplus: Implement partially transparent solid fill brushes. --- dlls/gdiplus/brush.c | 9 +++++++++ dlls/gdiplus/gdiplus.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 76e6a0f..92052f7 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -46,13 +46,19 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) switch(brush->bt){ case BrushTypeSolidColor: + { + GpSolidFill *fill; *clone = GdipAlloc(sizeof(GpSolidFill)); if (!*clone) return OutOfMemory; + fill = (GpSolidFill*)*clone; + memcpy(*clone, brush, sizeof(GpSolidFill)); (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); + fill->bmp = ARGB2BMP(fill->color); break; + } case BrushTypeHatchFill: *clone = GdipAlloc(sizeof(GpHatch)); if (!*clone) return OutOfMemory; @@ -560,6 +566,7 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) (*sf)->brush.gdibrush = CreateSolidBrush(col); (*sf)->brush.bt = BrushTypeSolidColor; (*sf)->color = color; + (*sf)->bmp = ARGB2BMP(color); return Ok; } @@ -842,6 +849,8 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipFree(((GpPathGradient*) brush)->blendpos); break; case BrushTypeSolidColor: + if (((GpSolidFill*)brush)->bmp) + DeleteObject(((GpSolidFill*)brush)->bmp); break; case BrushTypeLinearGradient: GdipFree(((GpLineGradient*)brush)->blendfac); diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 950e002..06019a2 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -258,6 +258,42 @@ COLORREF ARGB2COLORREF(ARGB color) ((color & 0xff0000) >> 16); } +HBITMAP ARGB2BMP(ARGB color) +{ + HDC hdc; + BITMAPINFO bi; + HBITMAP result; + RGBQUAD *bits; + int alpha; + + if ((color & 0xff000000) == 0xff000000) return 0; + + hdc = CreateCompatibleDC(NULL); + + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = 1; + bi.bmiHeader.biHeight = 1; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = 0; + bi.bmiHeader.biXPelsPerMeter = 0; + bi.bmiHeader.biYPelsPerMeter = 0; + bi.bmiHeader.biClrUsed = 0; + bi.bmiHeader.biClrImportant = 0; + + result = CreateDIBSection(hdc, &bi, DIB_RGB_COLORS, (void*)&bits, NULL, 0); + + bits[0].rgbReserved = alpha = (color>>24)&0xff; + bits[0].rgbRed = ((color>>16)&0xff)*alpha/255; + bits[0].rgbGreen = ((color>>8)&0xff)*alpha/255; + bits[0].rgbBlue = (color&0xff)*alpha/255; + + DeleteDC(hdc); + + return result; +} + /* Like atan2, but puts angle in correct quadrant if dx is 0. */ REAL gdiplus_atan2(REAL dy, REAL dx) { diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index af20c75..95133ca 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -41,6 +41,7 @@ #define TENSION_CONST (0.3) COLORREF ARGB2COLORREF(ARGB color); +HBITMAP ARGB2BMP(ARGB color); extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, REAL startAngle, REAL sweepAngle); extern REAL gdiplus_atan2(REAL dy, REAL dx); @@ -126,6 +127,7 @@ struct GpHatch{ struct GpSolidFill{ GpBrush brush; ARGB color; + HBITMAP bmp; }; struct GpPathGradient{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 78700ea..1c128d4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -346,6 +346,40 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) } break; } + case BrushTypeSolidColor: + { + GpSolidFill *fill = (GpSolidFill*)brush; + if (fill->bmp) + { + RECT rc; + /* partially transparent fill */ + + SelectClipPath(graphics->hdc, RGN_AND); + if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + { + HDC hdc = CreateCompatibleDC(NULL); + HBITMAP oldbmp; + BLENDFUNCTION bf; + + if (!hdc) break; + + oldbmp = SelectObject(hdc, fill->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); + + SelectObject(hdc, oldbmp); + DeleteDC(hdc); + } + + break; + } + /* else fall through */ + } default: SelectObject(graphics->hdc, brush->gdibrush); FillPath(graphics->hdc);

1 0

Ilya Shpigor : msi: Subscribe to SetProgress event on adding progress bar control to dialog.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: 6c64da8b7ca0303ca61b6442f9900366418260bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c64da8b7ca0303ca61b6442f… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Tue May 19 17:16:47 2009 +0400 msi: Subscribe to SetProgress event on adding progress bar control to dialog. --- dlls/msi/dialog.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index df79a37..495e033 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -135,6 +135,8 @@ static const WCHAR szMaskedEdit[] = { 'M','a','s','k','e','d','E','d','i','t',0 static const WCHAR szPathEdit[] = { 'P','a','t','h','E','d','i','t',0 }; static const WCHAR szProgressBar[] = { 'P','r','o','g','r','e','s','s','B','a','r',0 }; +static const WCHAR szSetProgress[] = { + 'S','e','t','P','r','o','g','r','e','s','s',0 }; static const WCHAR szRadioButtonGroup[] = { 'R','a','d','i','o','B','u','t','t','o','n','G','r','o','u','p',0 }; static const WCHAR szIcon[] = { 'I','c','o','n',0 }; @@ -1571,7 +1573,14 @@ end: static UINT msi_dialog_progress_bar( msi_dialog *dialog, MSIRECORD *rec ) { - msi_dialog_add_control( dialog, rec, PROGRESS_CLASSW, WS_VISIBLE ); + msi_control *control; + + control = msi_dialog_add_control( dialog, rec, PROGRESS_CLASSW, WS_VISIBLE ); + if( !control ) + return ERROR_FUNCTION_FAILED; + + ControlEvent_SubscribeToEvent( dialog->package, dialog, + szSetProgress, control->name, szProgress ); return ERROR_SUCCESS; }

1 0

Alexandre Julliard : kernel32: Add missing terminator on %wc format conversion.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: 8e6e015eb5d1f8701e9bf03574b4c0890b1c89ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6e015eb5d1f8701e9bf0357… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 13:31:01 2009 +0200 kernel32: Add missing terminator on %wc format conversion. --- dlls/kernel32/format_msg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 1fca102..f4baaae 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -266,8 +266,9 @@ DWORD WINAPI FormatMessageA( else if (strcmp(fmtstr, "%wc") == 0) { sz = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)argliststart, 1, NULL, 0, NULL, NULL); - b = HeapAlloc(GetProcessHeap(), 0, sz); + b = HeapAlloc(GetProcessHeap(), 0, sz + 1); WideCharToMultiByte(CP_ACP, 0, (WCHAR *)argliststart, 1, b, sz, NULL, NULL); + b[sz] = 0; } else {

1 0

Huw Davies : ole32/tests: Use the current stream position to determine the marshal data size.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: 825a1b759579ed282148b2b3039e1376a53d688c URL: http://source.winehq.org/git/wine.git/?a=commit;h=825a1b759579ed282148b2b30… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 21 11:27:41 2009 +0100 ole32/tests: Use the current stream position to determine the marshal data size. --- dlls/ole32/tests/usrmarshal.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index ed18ac5..2b7103c 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -564,7 +564,8 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); IStream *stm; void *marshal_data; - LARGE_INTEGER pos; + LARGE_INTEGER zero; + ULARGE_INTEGER pos; DWORD marshal_size; /* shows that the WdtpInterfacePointer functions don't marshal anything for @@ -587,8 +588,11 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) CreateStreamOnHGlobal(h, TRUE, &stm); CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); - marshal_size = GlobalSize(h); + zero.QuadPart = 0; + IStream_Seek(stm, zero, STREAM_SEEK_CUR, &pos); + marshal_size = pos.u.LowPart; marshal_data = GlobalLock(h); + trace("marshal_size %x\n", marshal_size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); size = WdtpInterfacePointer_UserSize(&umcb.Flags, ctx, 0, unk, &IID_IUnknown); @@ -608,8 +612,8 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) ok(!memcmp(marshal_data, wireip, marshal_size), "buffer mismatch\n"); GlobalUnlock(h); - pos.QuadPart = 0; - IStream_Seek(stm, pos, STREAM_SEEK_SET, NULL); + zero.QuadPart = 0; + IStream_Seek(stm, zero, STREAM_SEEK_SET, NULL); CoReleaseMarshalData(stm); IStream_Release(stm);

1 0