October 2009 - Wine-commits

Henri Verbeet : wined3d: Use stateblock_init_contained_states() for WINED3DSBT_PIXELSTATE stateblocks.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 93c949eba51b74a91dbaf11df81bbc2affcd4afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c949eba51b74a91dbaf11df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:10 2009 +0200 wined3d: Use stateblock_init_contained_states() for WINED3DSBT_PIXELSTATE stateblocks. --- dlls/wined3d/stateblock.c | 46 +-------------------------------------------- 1 files changed, 1 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c1a7184..9cbc1b2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1499,51 +1499,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); - - /* Pixel Shader Constants. */ - for (i = 0; i < gl_info->max_pshader_constantsF; ++i) - { - stateblock->contained_ps_consts_f[i] = i; - } - stateblock->num_contained_ps_consts_f = gl_info->max_pshader_constantsF; - - for (i = 0; i < MAX_CONST_B; ++i) - { - stateblock->contained_ps_consts_b[i] = i; - } - stateblock->num_contained_ps_consts_b = MAX_CONST_B; - - for (i = 0; i < MAX_CONST_I; ++i) - { - stateblock->contained_ps_consts_i[i] = i; - } - stateblock->num_contained_ps_consts_i = MAX_CONST_I; - - for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) - { - stateblock->contained_render_states[i] = SavedPixelStates_R[i]; - } - stateblock->num_contained_render_states = NUM_SAVEDPIXELSTATES_R; - - for (i = 0; i < MAX_TEXTURES; ++i) - { - for (j = 0; j < NUM_SAVEDPIXELSTATES_T; ++j) - { - stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = SavedPixelStates_T[j]; - ++stateblock->num_contained_tss_states; - } - } - - for (i = 0 ; i < MAX_COMBINED_SAMPLERS; ++i) - { - for (j = 0; j < NUM_SAVEDPIXELSTATES_S; ++j) - { - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = SavedPixelStates_S[j]; - stateblock->num_contained_sampler_states++; - } - } + stateblock_init_contained_states(stateblock); if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader);

1 0

Hans Leidekker : msi: Schedule a rename operation when the file to overwrite is in use.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 9c8b83ce015d91c44917c4aa4856d7a117ed170b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8b83ce015d91c44917c4aa4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 1 11:53:20 2009 +0200 msi: Schedule a rename operation when the file to overwrite is in use. --- dlls/msi/action.c | 3 + dlls/msi/files.c | 39 ++++++++++- dlls/msi/media.c | 47 ++++++++++++-- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 163 ++++++++++++++++++++++++++++++++++++---------- 5 files changed, 209 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c8b83ce015d91c44917c…

1 0

Stefan Dösinger : wined3d: Fix an error string.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: c749debec61345f5abbbcd67076a41d7b722db6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c749debec61345f5abbbcd670… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 29 17:43:44 2009 +0200 wined3d: Fix an error string. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8eac47c..5d494ec 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -693,7 +693,7 @@ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const ch GL_EXTCALL(glGenProgramsARB(1, &prog)); if(!prog) { - ERR("Failed to create an ARB offset limit test program\n"); + ERR("Failed to create the NVvp clip test program\n"); LEAVE_GL(); return FALSE; }

1 0

Stefan Dösinger : wined3d: Fix a contradicting comment .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 0c70291c2c818cf15e0b8f60fc9178faebf64702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c70291c2c818cf15e0b8f60f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 10 23:23:37 2009 +0200 wined3d: Fix a contradicting comment. The test was adopted from the ddraw test, where GetPrivateData does not addref. The test code was adjusted, the comment apparently not. --- dlls/d3d9/tests/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 638442e..69c85f0 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -365,7 +365,7 @@ static void test_private_data(IDirect3DDevice9 *device) hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DSurface9, &ptr, &size); ok(hr == D3D_OK, "IDirect3DSurface9_GetPrivateData failed with %08x\n", hr); ref2 = getref((IUnknown *) device); - /* Object is NOT being addrefed */ + /* Object is addrefed */ ok(ptr == (IUnknown *) device, "Returned interface pointer is %p, expected %p\n", ptr, device); ok(ref2 == ref + 2, "Object reference is %d, expected %d. ptr at %p, orig at %p\n", ref2, ref + 2, ptr, device); IUnknown_Release(ptr);

1 0

Roderick Colenbrander : winex11: Add support for 16-bit/32-bit DIB sections .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 6b8753185f30197047773af6a26eafd34d45367c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8753185f30197047773af6a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 26 14:52:46 2009 +0200 winex11: Add support for 16-bit/32-bit DIB sections. --- dlls/winex11.drv/dib.c | 39 ++++++++++++++++++++++++++++----------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4b15569..1fc8812 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4744,19 +4744,23 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, &physBitmap->nColorMap ); } - /* create pixmap and X image */ - wine_tsx11_lock(); - if(dib.dsBm.bmBitsPixel == 1) - { - physBitmap->pixmap_depth = 1; - physBitmap->trueColor = FALSE; - } - else + if (!X11DRV_XRender_SetPhysBitmapDepth( physBitmap, &dib )) { - physBitmap->pixmap_depth = screen_depth; - physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; - physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + if (dib.dsBm.bmBitsPixel == 1) + { + physBitmap->pixmap_depth = 1; + physBitmap->trueColor = FALSE; + } + else + { + physBitmap->pixmap_depth = screen_depth; + physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; + physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + } } + + /* create pixmap and X image */ + wine_tsx11_lock(); #ifdef HAVE_LIBXXSHM physBitmap->shminfo.shmid = -1; @@ -4803,6 +4807,19 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, wine_tsx11_unlock(); if (!physBitmap->pixmap || !physBitmap->image) return 0; + if (physBitmap->trueColor) + { + ColorShifts *shifts = &physBitmap->pixmap_color_shifts; + + /* When XRender is around and used, we also support dibsections in other formats like 16-bit. In these + * cases we need to override the mask of XImages. The reason is that during XImage creation the masks are + * derived from a 24-bit visual (no 16-bit ones are around when X runs at 24-bit). SetImageBits and other + * functions rely on the color masks for proper color conversion, so we need to override the masks here. */ + physBitmap->image->red_mask = shifts->physicalRed.max << shifts->physicalRed.shift; + physBitmap->image->green_mask = shifts->physicalGreen.max << shifts->physicalGreen.shift; + physBitmap->image->blue_mask = shifts->physicalBlue.max << shifts->physicalBlue.shift; + } + /* install fault handler */ InitializeCriticalSection( &physBitmap->lock ); physBitmap->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": X_PHYSBITMAP.lock"); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8f0764d..922855d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -286,6 +286,7 @@ extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *phys extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx); +extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib); BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 9280ce3..076b6d4 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2,6 +2,7 @@ * Functions to use the XRender extension * * Copyright 2001, 2002 Huw D M Davies for CodeWeavers + * Copyright 2009 Roderick Colenbrander * * Some parts also: * Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. @@ -835,6 +836,33 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) return; } +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +{ + WineXRenderFormat *fmt; + ColorShifts shifts; + + /* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion + * in software. Further we also return the screen depth for paletted formats or TrueColor formats with a low + * number of bits because XRender can't handle paletted formats and 8-bit TrueColor does not exist for XRender. */ + if(!X11DRV_XRender_Installed || dib->dsBm.bmBitsPixel <= 8) + return FALSE; + + X11DRV_PALETTE_ComputeColorShifts(&shifts, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + + /* Common formats should be in our picture format table. */ + fmt = get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts); + if(fmt) + { + physBitmap->pixmap_depth = fmt->pict_format->depth; + physBitmap->trueColor = TRUE; + physBitmap->pixmap_color_shifts = shifts; + return TRUE; + } + TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", + dib->dsBm.bmBitsPixel, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + return FALSE; +} + /*********************************************************************** * X11DRV_XRender_UpdateDrawable * @@ -2172,6 +2200,11 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, wine_tsx11_unlock(); } +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +{ + return FALSE; +} + BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc,

1 0

Austin English : dwmapi: Add a stub for DwmGetGraphicsStreamClient.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: ce4d4909a108aeb9bc98e29350757bade89d755c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4d4909a108aeb9bc98e2935… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 30 13:11:20 2009 -0500 dwmapi: Add a stub for DwmGetGraphicsStreamClient. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 7b7ad8e..27e0704 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -29,7 +29,7 @@ @ stdcall DwmFlush() @ stdcall DwmGetColorizationColor(ptr long) @ stub DwmGetCompositionTimingInfo -@ stub DwmGetGraphicsStreamClient +@ stdcall DwmGetGraphicsStreamClient(long ptr) @ stub DwmGetGraphicsStreamTransformHint @ stdcall DwmGetTransportAttributes(ptr ptr ptr) @ stub DwmGetWindowAttribute diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 2bbb501..40ecec7 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -110,10 +110,19 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr return E_NOTIMPL; } +/********************************************************************** + * DwmGetGraphicsStreamClient (DWMAPI.@) + */ +HRESULT WINAPI DwmGetGraphicsStreamClient(UINT uIndex, UUID *pClientUuid) +{ + FIXME("(%d, %p) stub\n", uIndex, pClientUuid); + + return E_NOTIMPL; +} /********************************************************************** - * * DwmGetTransportAttributes (DWMAPI.@) - * */ + * DwmGetTransportAttributes (DWMAPI.@) + */ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected, DWORD *pDwGeneration) { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration);

1 0

Owen Rudge : mapi32: Pass DllGetClassObject through to Extended MAPI provider.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: cc4a6693f1a0364ed9af72a52adb040a55c5a802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4a6693f1a0364ed9af72a52… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 30 16:09:25 2009 +0100 mapi32: Pass DllGetClassObject through to Extended MAPI provider. --- dlls/mapi32/mapi32_main.c | 11 ++++++++++- dlls/mapi32/util.c | 2 ++ dlls/mapi32/util.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 5039c29..28c2f14 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -61,8 +61,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - *ppv = NULL; + if (mapiFunctions.DllGetClassObject) + { + HRESULT ret = mapiFunctions.DllGetClassObject(rclsid, iid, ppv); + + TRACE("ret: %x\n", ret); + return ret; + } + FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + + *ppv = NULL; return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 4957941..fdb8497 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -1056,6 +1056,8 @@ void load_mapi_providers(void) mapiFunctions.MAPIInitialize = (void*) GetProcAddress(mapi_ex_provider, "MAPIInitialize"); mapiFunctions.MAPILogonEx = (void*) GetProcAddress(mapi_ex_provider, "MAPILogonEx"); mapiFunctions.MAPIUninitialize = (void*) GetProcAddress(mapi_ex_provider, "MAPIUninitialize"); + + mapiFunctions.DllGetClassObject = (void*) GetProcAddress(mapi_ex_provider, "DllGetClassObject"); } cleanUp: diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 69b1603..9899053 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -43,6 +43,8 @@ typedef struct MAPI_FUNCTIONS { LPMAPISENDMAIL MAPISendMail; LPMAPISENDDOCUMENTS MAPISendDocuments; LPMAPIUNINITIALIZE MAPIUninitialize; + + HRESULT (WINAPI *DllGetClassObject)(REFCLSID, REFIID, LPVOID *); } MAPI_FUNCTIONS; extern MAPI_FUNCTIONS mapiFunctions;

1 0

Owen Rudge : comctl32: Implement highlighting (marquee) selection support in listview.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 69b76a18fb19bd4a6c83f4f05eb942513af970fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b76a18fb19bd4a6c83f4f05… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 30 16:41:23 2009 +0100 comctl32: Implement highlighting (marquee) selection support in listview. --- dlls/comctl32/listview.c | 135 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 120 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1c0f58b..eb2dbfb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7,6 +7,7 @@ * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun * Copyright 2009 Nikolay Sivov + * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -98,7 +99,6 @@ * -- LVN_BEGINSCROLL, LVN_ENDSCROLL * -- LVN_GETINFOTIP * -- LVN_HOTTRACK - * -- LVN_MARQUEEBEGIN * -- LVN_SETDISPINFO * -- NM_HOVER * -- LVN_BEGINRDRAG @@ -248,6 +248,8 @@ typedef struct tagLISTVIEW_INFO BOOL bLButtonDown; BOOL bRButtonDown; BOOL bDragging; + BOOL bMarqueeSelect; /* marquee selection/highlight underway */ + RECT marqueeRect; POINT ptClickPos; /* point where the user clicked */ BOOL bNoItemMetrics; /* flags if item metrics are not yet computed */ INT nItemHeight; @@ -3605,17 +3607,94 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); - rect.left = infoPtr->ptClickPos.x - wDragWidth; - rect.right = infoPtr->ptClickPos.x + wDragWidth; - rect.top = infoPtr->ptClickPos.y - wDragHeight; - rect.bottom = infoPtr->ptClickPos.y + wDragHeight; - tmp.x = x; tmp.y = y; lvHitTestInfo.pt = tmp; LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + if (infoPtr->bMarqueeSelect) + { + LVITEMW item; + ITERATOR i; + + if (x > infoPtr->ptClickPos.x) + { + rect.left = infoPtr->ptClickPos.x; + rect.right = x; + } + else + { + rect.left = x; + rect.right = infoPtr->ptClickPos.x; + } + + if (y > infoPtr->ptClickPos.y) + { + rect.top = infoPtr->ptClickPos.y; + rect.bottom = y; + } + else + { + rect.top = y; + rect.bottom = infoPtr->ptClickPos.y; + } + + /* Cancel out the old marquee rectangle and draw the new one */ + LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeRect); + + /* Invert the items in the old marquee rectangle */ + iterator_frameditems(&i, infoPtr, &infoPtr->marqueeRect); + + while (iterator_next(&i)) + { + if (i.nItem > -1) + { + if (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED) == LVIS_SELECTED) + item.state = 0; + else + item.state = LVIS_SELECTED; + + item.stateMask = LVIS_SELECTED; + + LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + } + } + + iterator_destroy(&i); + + CopyRect(&infoPtr->marqueeRect, &rect); + + /* Iterate over the items within our marquee rectangle */ + iterator_frameditems(&i, infoPtr, &rect); + + while (iterator_next(&i)) + { + if (i.nItem > -1) + { + /* If CTRL is pressed, invert. If not, always select the item. */ + if ((fwKeys & MK_CONTROL) && (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED))) + item.state = 0; + else + item.state = LVIS_SELECTED; + + item.stateMask = LVIS_SELECTED; + + LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + } + } + + iterator_destroy(&i); + + LISTVIEW_InvalidateRect(infoPtr, &rect); + return 0; + } + + rect.left = infoPtr->ptClickPos.x - wDragWidth; + rect.right = infoPtr->ptClickPos.x + wDragWidth; + rect.top = infoPtr->ptClickPos.y - wDragHeight; + rect.bottom = infoPtr->ptClickPos.y + wDragHeight; + /* reset item marker */ if (infoPtr->nLButtonDownItem != lvHitTestInfo.iItem) infoPtr->nLButtonDownItem = -1; @@ -3640,17 +3719,31 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (!infoPtr->bDragging) { - NMLISTVIEW nmlv; - lvHitTestInfo.pt = infoPtr->ptClickPos; LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); - ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iItem = lvHitTestInfo.iItem; - nmlv.ptAction = infoPtr->ptClickPos; + /* If the click is outside the range of an item, begin a + highlight. If not, begin an item drag. */ + if (lvHitTestInfo.iItem == -1) + { + NMHDR hdr; + + /* If we're allowing multiple selections, send notification. + If return value is non-zero, cancel. */ + if (!(infoPtr->dwStyle & LVS_SINGLESEL) && (notify_hdr(infoPtr, LVN_MARQUEEBEGIN, &hdr) == 0)) + infoPtr->bMarqueeSelect = TRUE; + } + else + { + NMLISTVIEW nmlv; - notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); - infoPtr->bDragging = TRUE; + ZeroMemory(&nmlv, sizeof(nmlv)); + nmlv.iItem = lvHitTestInfo.iItem; + nmlv.ptAction = infoPtr->ptClickPos; + + notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); + infoPtr->bDragging = TRUE; + } } return 0; @@ -4643,6 +4736,10 @@ enddraw: if ((infoPtr->uView == LV_VIEW_DETAILS) && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) LISTVIEW_RefreshReportGrid(infoPtr, hdc); + /* Draw marquee rectangle if appropriate */ + if (infoPtr->bMarqueeSelect) + DrawFocusRect(hdc, &infoPtr->marqueeRect); + if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); @@ -9312,6 +9409,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN infoPtr->bLButtonDown = TRUE; infoPtr->ptClickPos = pt; infoPtr->bDragging = FALSE; + infoPtr->bMarqueeSelect = FALSE; lvHitTestInfo.pt.x = x; lvHitTestInfo.pt.y = y; @@ -9433,9 +9531,16 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT LISTVIEW_SetSelection(infoPtr, infoPtr->nLButtonDownItem); infoPtr->nLButtonDownItem = -1; - if (infoPtr->bDragging) + if (infoPtr->bDragging || infoPtr->bMarqueeSelect) { + /* Remove the marquee rectangle */ + if (infoPtr->bMarqueeSelect) + LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeRect); + + SetRect(&infoPtr->marqueeRect, 0, 0, 0, 0); + infoPtr->bDragging = FALSE; + infoPtr->bMarqueeSelect = FALSE; return 0; }

1 0

Chris Robinson : openal32: Watch for the generic device names, and map them to the default.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 1bb5219a5832d6d7dcddf046180f313769d9b3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb5219a5832d6d7dcddf0461… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Sep 30 08:37:54 2009 -0700 openal32: Watch for the generic device names, and map them to the default. --- dlls/openal32/openal.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 792a870..88bfc9c 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -289,6 +289,12 @@ ALCdevice* CDECL wine_alcGetContextsDevice(ALCcontext *context) ALCdevice* CDECL wine_alcOpenDevice(const ALCchar *devicename) { + if(devicename != NULL && (strcmp(devicename, "DirectSound3D") == 0 || + strcmp(devicename, "DirectSound") == 0 || + strcmp(devicename, "Generic Hardware") == 0 || + strcmp(devicename, "Generic Software") == 0)) { + devicename = NULL; + } return alcOpenDevice(devicename); }

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 633293ad5f6f330b43be874c6cf26cd24ed58422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=633293ad5f6f330b43be874c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 30 19:18:40 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index c523b6d..8c23e41 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -29,6 +29,7 @@ STRINGTABLE DISCARDABLE { IDS_TO_PRIMITIVE "Erreur lors de la conversion de l'objet vers un type primitif" IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" + IDS_CREATE_OBJ_ERROR "Le serveur d'automatisation ne peut créer l'objet" IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" IDS_ARG_NOT_OPT "Argument non optionnel" IDS_SYNTAX_ERROR "Erreur de syntaxe"

1 0