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

Alexandre Julliard : winex11: Don' t wait for the foreground window to start clipping in ClipCursor.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 9556b4f7dbf71aec2f4ebf89ec164ae91d9b43ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9556b4f7dbf71aec2f4ebf89e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 14:31:05 2011 +0200 winex11: Don't wait for the foreground window to start clipping in ClipCursor. --- dlls/winex11.drv/mouse.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d369f6c..b79525a 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1277,7 +1277,8 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) { TRACE( "forwarding clip request to %p\n", foreground ); - if (SendMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 )) return TRUE; + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + return TRUE; } else if (grab_clipping_window( clip, FALSE )) return TRUE; }

1 0

Stefan Dösinger : wined3d: Fix data types in RxGx snorm-unorm conversion.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 1d7a05cb80462ebd818613fb7aa983d4a9f4d557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7a05cb80462ebd818613fb7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 21:17:31 2011 +0200 wined3d: Fix data types in RxGx snorm-unorm conversion. --- dlls/wined3d/utils.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0df2c9e..20b6001 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -346,10 +346,10 @@ static void convert_r8g8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT widt Dest = dst + y * outpitch; for (x = 0; x < width; x++ ) { - LONG color = (*Source++); + const short color = (*Source++); /* B */ Dest[0] = 0xff; /* G */ Dest[1] = (color >> 8) + 128; /* V */ - /* R */ Dest[2] = (color) + 128; /* U */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ Dest += 3; } } @@ -440,10 +440,10 @@ static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT wi Dest = (unsigned short *) (dst + y * outpitch); for (x = 0; x < width; x++ ) { - DWORD color = (*Source++); + const DWORD color = (*Source++); /* B */ Dest[0] = 0xffff; /* G */ Dest[1] = (color >> 16) + 32768; /* V */ - /* R */ Dest[2] = (color ) + 32768; /* U */ + /* R */ Dest[2] = (color & 0xffff) + 32768; /* U */ Dest += 3; } }

1 0

Alexandre Julliard : winex11: Filter out motion events resulting from setting the clip window.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: d1f5c13162d15873b2b51b28cfb56035f0890183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f5c13162d15873b2b51b28c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 14:34:10 2011 +0200 winex11: Filter out motion events resulting from setting the clip window. --- dlls/winex11.drv/mouse.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 188e36f..8456d67 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -404,6 +404,12 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, clip->right - clip->left, clip->bottom - clip->top ); XMapWindow( data->display, clip_window ); + + /* if the rectangle is shrinking we may get a pointer warp */ + if (msg_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top || + clip->right < clip_rect.right || clip->bottom < clip_rect.bottom) + data->warp_serial = NextRequest( data->display ); + if (!XGrabPointer( data->display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime ))

1 0

Stefan Dösinger : wined3d: Cast clipplane doubles to floats.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 1b860b11b357b54fa34a85eae75dce73f82a3662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b860b11b357b54fa34a85eae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 21:09:41 2011 +0200 wined3d: Cast clipplane doubles to floats. --- dlls/wined3d/stateblock.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index bbbcae2..8dfa232 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1055,10 +1055,10 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo if (!(map & 1)) continue; - clip[0] = stateblock->state.clip_planes[i][0]; - clip[1] = stateblock->state.clip_planes[i][1]; - clip[2] = stateblock->state.clip_planes[i][2]; - clip[3] = stateblock->state.clip_planes[i][3]; + clip[0] = (float) stateblock->state.clip_planes[i][0]; + clip[1] = (float) stateblock->state.clip_planes[i][1]; + clip[2] = (float) stateblock->state.clip_planes[i][2]; + clip[3] = (float) stateblock->state.clip_planes[i][3]; IWineD3DDevice_SetClipPlane(device, i, clip); }

1 0

Nikolay Sivov : comctl32/treeview: Store item state supplied from TVN_GETDISPINFO handler.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: f9b14fda026fe71cb055a20833069e1c16e328ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b14fda026fe71cb055a2083… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 14 15:18:49 2011 +0400 comctl32/treeview: Store item state supplied from TVN_GETDISPINFO handler. --- dlls/comctl32/tests/treeview.c | 3 ++- dlls/comctl32/treeview.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 7dd9aac..002d69c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -468,10 +468,11 @@ static void test_callback(void) tvi.hItem = hRoot; tvi.mask = TVIF_IMAGE; tvi.state = INDEXTOSTATEIMAGEMASK(1); + tvi.stateMask = 0; ret = TreeView_GetItem(hTree, &tvi); expect(TRUE, ret); /* handler sets TVIS_SELECTED as well */ - todo_wine ok(tvi.state == (TVIS_FOCUSED | TVIS_SELECTED | INDEXTOSTATEIMAGEMASK(2) | INDEXTOOVERLAYMASK(3)), "got 0x%x\n", tvi.state); + ok(tvi.state == (TVIS_FOCUSED | TVIS_SELECTED | INDEXTOSTATEIMAGEMASK(2) | INDEXTOOVERLAYMASK(3)), "got 0x%x\n", tvi.state); g_disp_set_stateimage = FALSE; ok_sequence(sequences, PARENT_SEQ_INDEX, parent_get_dispinfo_seq, diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 84c2c8b..453985a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -815,6 +815,12 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if (mask & TVIF_CHILDREN) wineItem->cChildren = callback.item.cChildren; + if (callback.item.mask & TVIF_STATE) + { + wineItem->state &= ~callback.item.stateMask; + wineItem->state |= (callback.item.state & callback.item.stateMask); + } + /* These members are now permanently set. */ if (callback.item.mask & TVIF_DI_SETITEM) wineItem->callbackMask &= ~callback.item.mask;

1 0

Nikolay Sivov : comctl32/treeview: Get rid of wine prefixed names.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 28169c6d5507d8a3de1a5d101e2259b4c7c7c59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28169c6d5507d8a3de1a5d101… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 14 16:55:48 2011 +0400 comctl32/treeview: Get rid of wine prefixed names. --- dlls/comctl32/treeview.c | 639 +++++++++++++++++++++++----------------------- 1 files changed, 317 insertions(+), 322 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28169c6d5507d8a3de1a5…

1 0

Stefan Dösinger : wined3d: Consistently store format bitcounts in BYTEs.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 20b147bfebbe46997fc0809de9086ab5a5d51abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b147bfebbe46997fc0809de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 21:05:29 2011 +0200 wined3d: Consistently store format bitcounts in BYTEs. --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/directx.c | 10 +++++----- dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 99f189b..5d417b1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1177,8 +1177,8 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, { int iPixelFormat=0; unsigned int matchtry; - short redBits, greenBits, blueBits, alphaBits, colorBits; - short depthBits=0, stencilBits=0; + BYTE redBits, greenBits, blueBits, alphaBits, colorBits; + BYTE depthBits=0, stencilBits=0; static const struct { @@ -2052,7 +2052,7 @@ static inline void context_set_render_offscreen(struct wined3d_context *context, static BOOL match_depth_stencil_format(const struct wined3d_format *existing, const struct wined3d_format *required) { - short existing_depth, existing_stencil, required_depth, required_stencil; + BYTE existing_depth, existing_stencil, required_depth, required_stencil; if (existing == required) return TRUE; if ((existing->flags & WINED3DFMT_FLAG_FLOAT) != (required->flags & WINED3DFMT_FLAG_FLOAT)) return FALSE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7951d02..4dff331 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2934,7 +2934,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { - short redSize, greenSize, blueSize, alphaSize, colorBits; + BYTE redSize, greenSize, blueSize, alphaSize, colorBits; if(!cfg) return FALSE; @@ -2971,7 +2971,7 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { - short depthSize, stencilSize; + BYTE depthSize, stencilSize; BOOL lockable = FALSE; if(!cfg) @@ -3117,7 +3117,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 } else if (format->flags & WINED3DFMT_FLAG_RENDERTARGET) { - short redSize, greenSize, blueSize, alphaSize, colorBits; + BYTE redSize, greenSize, blueSize, alphaSize, colorBits; const struct wined3d_pixel_format *cfgs; unsigned int i, cfg_count; @@ -3217,8 +3217,8 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, if (!(check_format->flags & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { - short AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; - short CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; + BYTE AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; + BYTE CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; const struct wined3d_pixel_format *cfgs = adapter->cfgs; int it; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c22cdd9..0df2c9e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -34,7 +34,7 @@ struct StaticPixelFormatDesc enum wined3d_format_id id; DWORD alphaMask, redMask, greenMask, blueMask; UINT bpp; - short depthSize, stencilSize; + BYTE depthSize, stencilSize; }; /***************************************************************************** @@ -2535,7 +2535,7 @@ unsigned int count_bits(unsigned int mask) /* Helper function for retrieving color info for ChoosePixelFormat and wglChoosePixelFormatARB. * The later function requires individual color components. */ BOOL getColorBits(const struct wined3d_format *format, - short *redSize, short *greenSize, short *blueSize, short *alphaSize, short *totalSize) + BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) { TRACE("format %s.\n", debug_d3dformat(format->id)); @@ -2573,7 +2573,7 @@ BOOL getColorBits(const struct wined3d_format *format, } /* Helper function for retrieving depth/stencil info for ChoosePixelFormat and wglChoosePixelFormatARB */ -BOOL getDepthStencilBits(const struct wined3d_format *format, short *depthSize, short *stencilSize) +BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) { TRACE("format %s.\n", debug_d3dformat(format->id)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f076748..c599af0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2540,9 +2540,9 @@ void state_fog_fragpart(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL getColorBits(const struct wined3d_format *format, - short *redSize, short *greenSize, short *blueSize, short *alphaSize, short *totalSize) DECLSPEC_HIDDEN; + BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) DECLSPEC_HIDDEN; BOOL getDepthStencilBits(const struct wined3d_format *format, - short *depthSize, short *stencilSize) DECLSPEC_HIDDEN; + BYTE *depthSize, BYTE *stencilSize) DECLSPEC_HIDDEN; /* Math utils */ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2) DECLSPEC_HIDDEN; @@ -2812,8 +2812,8 @@ struct wined3d_format DWORD blue_mask; DWORD alpha_mask; UINT byte_count; - WORD depth_size; - WORD stencil_size; + BYTE depth_size; + BYTE stencil_size; UINT block_width; UINT block_height;

1 0

Nikolay Sivov : comctl32/treeview: Properly update image state index when TVS_CHECKBOXES is switched on.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 7ef4546cfb071a2d3661dfaf555208f4c599bf08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef4546cfb071a2d3661dfaf5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 14 16:21:33 2011 +0400 comctl32/treeview: Properly update image state index when TVS_CHECKBOXES is switched on. --- dlls/comctl32/tests/treeview.c | 130 ++++++++++++++++++++++++++++++--------- dlls/comctl32/treeview.c | 18 ++++++ 2 files changed, 118 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef4546cfb071a2d3661d…

1 0

Austin English : shell32: Add a stub for SHOpenFolderAndSelectItems.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 3174ea94c13c4aca3963c0bcaa040c6a0d0dabf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3174ea94c13c4aca3963c0bca… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 15 13:13:21 2011 -0500 shell32: Add a stub for SHOpenFolderAndSelectItems. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shlfolder.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index b5debf1..97e52e5 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -392,6 +392,7 @@ @ stdcall SHIsFileAvailableOffline(wstr ptr) @ stdcall SHLoadInProc(long) @ stdcall SHLoadNonloadedIconOverlayIdentifiers() +@ stdcall SHOpenFolderAndSelectItems(ptr long ptr long) @ stdcall SHParseDisplayName(wstr ptr ptr long ptr) @ stdcall SHPathPrepareForWriteA(long ptr str long) @ stdcall SHPathPrepareForWriteW(long ptr wstr long) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index f905b70..f663f48 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -580,3 +580,15 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, LPDATAOBJECT lpDataObje FIXME("%p %s %p %08x %p\n",hWnd,lpszDir,lpDataObject,uFlags,lppidlLinks); return E_NOTIMPL; } + +/*********************************************************************** + * SHOpenFolderAndSelectItems + * + * Added in XP. + */ +HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, + PCUITEMID_CHILD_ARRAY *apidl, DWORD flags ) +{ + FIXME("%p %u %p 0x%x: stub\n", pidlFolder, cidl, apidl, flags); + return E_NOTIMPL; +}

1 0

Nikolay Sivov : comctl32/treeview: Always return state from TVM_GETITEM handler.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 1fa1c72d90b69c739a1004b6d0d686548cdcdb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa1c72d90b69c739a1004b6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 14 15:12:06 2011 +0400 comctl32/treeview: Always return state from TVM_GETITEM handler. --- dlls/comctl32/tests/treeview.c | 112 +++++++++++++++++++++++++++++++++++----- dlls/comctl32/treeview.c | 19 +++---- 2 files changed, 106 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fa1c72d90b69c739a100…

1 0