September 2011 - Wine-commits

Piotr Caban : shell32: Fixed SHCNRF_NewDelivery flag support in SHChangeNotify.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 93c001b0a937d3c6b2fa52db5c421c749b05e1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c001b0a937d3c6b2fa52db5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 21 09:53:55 2011 +0200 shell32: Fixed SHCNRF_NewDelivery flag support in SHChangeNotify. --- dlls/shell32/changenotify.c | 87 ++++++++++++++++++++++++++++-------------- 1 files changed, 58 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 96a20e2..94efb7a 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -51,9 +51,7 @@ typedef struct _NOTIFICATIONLIST LPNOTIFYREGISTER apidl; /* array of entries to watch*/ UINT cidl; /* number of pidls in array */ LONG wEventMask; /* subscribed events */ - LONG wSignalledEvent; /* event that occurred */ DWORD dwFlags; /* client flags */ - LPCITEMIDLIST pidlSignaled; /*pidl of the path that caused the signal*/ ULONG id; } NOTIFICATIONLIST, *LPNOTIFICATIONLIST; @@ -185,7 +183,6 @@ SHChangeNotifyRegister( item->hwnd = hwnd; item->uMsg = uMsg; item->wEventMask = wEventMask; - item->wSignalledEvent = 0; item->dwFlags = fSources; item->id = InterlockedIncrement( &next_id ); @@ -236,6 +233,15 @@ BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2, return -1; } +struct new_delivery_notification +{ + LONG event; + DWORD pidl1_size; + DWORD pidl2_size; + LPITEMIDLIST pidls[2]; + BYTE data[1]; +}; + static BOOL should_notify( LPCITEMIDLIST changed, LPCITEMIDLIST watched, BOOL sub ) { TRACE("%p %p %d\n", changed, watched, sub ); @@ -260,6 +266,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID DWORD flags; } *cur, *next; + HANDLE shared_data = NULL; LPITEMIDLIST Pidls[2]; LPNOTIFICATIONLIST ptr; struct list recipients; @@ -368,16 +375,43 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID { TRACE("notifying %p, event %s(%x)\n", cur->hwnd, DumpEvent(wEventId), wEventId); - ptr->wSignalledEvent |= wEventId; + if (cur->flags & SHCNRF_NewDelivery) { + if(!shared_data) { + struct new_delivery_notification *notification; + UINT size1 = ILGetSize(Pidls[0]), size2 = ILGetSize(Pidls[1]); + UINT offset = (size1+sizeof(int)-1)/sizeof(int)*sizeof(int); + + notification = SHAlloc(sizeof(struct new_delivery_notification)+offset+size2); + if(!notification) { + ERR("out of memory\n"); + } else { + notification->event = wEventId; + notification->pidl1_size = size1; + notification->pidl2_size = size2; + if(size1) + memcpy(notification->data, Pidls[0], size1); + if(size2) + memcpy(notification->data+offset, Pidls[1], size2); + + shared_data = SHAllocShared(notification, + sizeof(struct new_delivery_notification)+size1+size2, + GetCurrentProcessId()); + SHFree(notification); + } + } - if (cur->flags & SHCNRF_NewDelivery) - FIXME("SHCNRF_NewDelivery flag is not supported\n"); - else + if(shared_data) + SendMessageA(cur->hwnd, cur->msg, (WPARAM)shared_data, GetCurrentProcessId()); + else + ERR("out of memory\n"); + } else { SendMessageA(cur->hwnd, cur->msg, (WPARAM)Pidls, wEventId); + } list_remove(&cur->entry); SHFree(cur); } + SHFreeShared(shared_data, GetCurrentProcessId()); SHFree(Pidls[0]); SHFree(Pidls[1]); @@ -418,33 +452,28 @@ HANDLE WINAPI SHChangeNotification_Lock( LPITEMIDLIST **lppidls, LPLONG lpwEventId) { - DWORD i; - LPNOTIFICATIONLIST node; - LPCITEMIDLIST *idlist; + struct new_delivery_notification *ndn; + UINT offset; TRACE("%p %08x %p %p\n", hChange, dwProcessId, lppidls, lpwEventId); - /* EnterCriticalSection(&SHELL32_ChangenotifyCS); */ + ndn = SHLockShared(hChange, dwProcessId); + if(!ndn) { + WARN("SHLockShared failed\n"); + return NULL; + } - LIST_FOR_EACH_ENTRY( node, &notifications, NOTIFICATIONLIST, entry ) - { - if (node == hChange) - { - idlist = SHAlloc( sizeof(LPCITEMIDLIST *) * node->cidl ); - for(i=0; i<node->cidl; i++) - idlist[i] = node->pidlSignaled; - *lpwEventId = node->wSignalledEvent; - *lppidls = (LPITEMIDLIST*)idlist; - node->wSignalledEvent = 0; - /* LeaveCriticalSection(&SHELL32_ChangenotifyCS); */ - return node; - } + if(lppidls) { + offset = (ndn->pidl1_size+sizeof(int)-1)/sizeof(int)*sizeof(int); + ndn->pidls[0] = ndn->pidl1_size ? (LPITEMIDLIST)ndn->data : NULL; + ndn->pidls[1] = ndn->pidl2_size ? (LPITEMIDLIST)(ndn->data+offset) : NULL; + *lppidls = ndn->pidls; } - ERR("Couldn't find %p\n", hChange ); - /* LeaveCriticalSection(&SHELL32_ChangenotifyCS); */ + if(lpwEventId) + *lpwEventId = ndn->event; - return 0; + return ndn; } /************************************************************************* @@ -452,8 +481,8 @@ HANDLE WINAPI SHChangeNotification_Lock( */ BOOL WINAPI SHChangeNotification_Unlock ( HANDLE hLock) { - TRACE("\n"); - return 1; + TRACE("%p\n", hLock); + return SHUnlockShared(hLock); } /*************************************************************************

1 0

Piotr Caban : shell32/tests: Added more SHChangeNotify tests.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: ceb7add45d57597265f815d28dd40458d82381d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb7add45d57597265f815d28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 21 09:54:16 2011 +0200 shell32/tests: Added more SHChangeNotify tests. --- dlls/shell32/tests/shlfolder.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c85848b..e9e4267 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4343,16 +4343,23 @@ struct ChNotifyTest { }; struct ChNotifyTest *exp_data; +BOOL test_new_delivery_flag; static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - UINT signal = (UINT)lparam; + LONG signal = (LONG)lparam; switch(msg){ case WM_USER_NOTIFY: - if(exp_data->missing_events > 0){ + if(exp_data->missing_events > 0) { WCHAR *path1, *path2; - LPCITEMIDLIST *pidls = (LPCITEMIDLIST*)wparam; + LPITEMIDLIST *pidls = (LPITEMIDLIST*)wparam; + HANDLE hLock = NULL; + + if(test_new_delivery_flag) { + hLock = SHChangeNotification_Lock((HANDLE)wparam, lparam, &pidls, &signal); + ok(hLock != NULL, "SHChangeNotification_Lock returned NULL\n"); + } ok(exp_data->signal == signal, "%s: expected notification type %x, got: %x\n", @@ -4367,6 +4374,9 @@ static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L HeapFree(GetProcessHeap(), 0, path2); exp_data->missing_events--; + + if(test_new_delivery_flag) + SHChangeNotification_Unlock(hLock); }else ok(0, "Didn't expect a WM_USER_NOTIFY message (event: %x)\n", signal); return 0; @@ -4408,7 +4418,7 @@ static void do_events(void) trace("%s: took %d tries\n", exp_data->id, c); } -static void test_SHChangeNotify(void) +static void test_SHChangeNotify(BOOL test_new_delivery) { HWND wnd; ULONG notifyID, i; @@ -4418,10 +4428,14 @@ static void test_SHChangeNotify(void) const CHAR root_dirA[] = "C:\\shell32_cn_test"; const WCHAR root_dirW[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t',0}; + trace("SHChangeNotify tests (%x)\n", test_new_delivery); + CreateDirectoryW(NULL, NULL); has_unicode = !(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); - register_testwindow_class(); + test_new_delivery_flag = test_new_delivery; + if(!test_new_delivery) + register_testwindow_class(); wnd = CreateWindowExA(0, testwindow_class, testwindow_class, 0, CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, @@ -4439,7 +4453,7 @@ static void test_SHChangeNotify(void) ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); entries[0].fRecursive = TRUE; - notifyID = SHChangeNotifyRegister(wnd, SHCNRF_ShellLevel, + notifyID = SHChangeNotifyRegister(wnd, !test_new_delivery ? SHCNRF_ShellLevel : SHCNRF_ShellLevel|SHCNRF_NewDelivery, SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); ok(notifyID != 0, "Failed to register a window for change notifications\n"); @@ -4595,7 +4609,8 @@ START_TEST(shlfolder) test_SHGetIDListFromObject(); test_SHGetItemFromObject(); test_ShellItemCompare(); - test_SHChangeNotify(); + test_SHChangeNotify(FALSE); + test_SHChangeNotify(TRUE); test_ShellItemBindToHandler(); test_ShellItemGetAttributes(); test_SHCreateDefaultContextMenu();

1 0

Alexandre Julliard : winex11: Move locking and handling of fg/ bg colors into xrender_mono_blit.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 4ad9e7bbcdf210e81c7deeeb61be509015e19324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad9e7bbcdf210e81c7deeeb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 20:22:34 2011 +0200 winex11: Move locking and handling of fg/bg colors into xrender_mono_blit. --- dlls/winex11.drv/xrender.c | 68 +++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cdd71e8..370d5f3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2288,6 +2288,7 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d /* When we need to scale we perform scaling and source_x / source_y translation using a transformation matrix. * This is needed because XRender is inaccurate in combination with scaled source coordinates passed to XRenderComposite. * In all other cases we do use XRenderComposite for translation as it is faster than using a transformation matrix. */ + wine_tsx11_lock(); if(xscale != 1.0 || yscale != 1.0) { /* In case of mirroring we need a source x- and y-offset because without the pixels will be @@ -2305,21 +2306,28 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d } pXRenderComposite( gdi_display, op, src_pict, mask_pict, dst_pict, x_offset, y_offset, 0, 0, x_dst, y_dst, width, height ); + wine_tsx11_unlock(); } /* Helper function for (stretched) mono->color blitting using xrender */ -static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_pict, +static void xrender_mono_blit( Picture src_pict, Picture dst_pict, + enum wxr_format dst_format, XRenderColor *fg, XRenderColor *bg, int x_src, int y_src, int x_dst, int y_dst, double xscale, double yscale, int width, int height ) { + Picture tile_pict; int x_offset, y_offset; - /* When doing a mono->color blit, 'src_pict' contains a 1x1 picture for tiling, the actual - * source data is in mask_pict. The 'mask_pict' data effectively acts as an alpha channel to the - * tile data. We need PictOpOver for correct rendering. - * Note since the 'source data' is in the mask picture, we have to pass x_src / y_src using - * mask_x / mask_y + /* When doing a mono->color blit, the source data is used as mask, and the source picture + * contains a 1x1 picture for tiling. The source data effectively acts as an alpha channel to + * the tile data. */ + EnterCriticalSection( &xrender_cs ); + tile_pict = get_tile_pict( dst_format, bg ); + + wine_tsx11_lock(); + pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, fg, x_dst, y_dst, width, height ); + if (xscale != 1.0 || yscale != 1.0) { /* In case of mirroring we need a source x- and y-offset because without the pixels will be @@ -2327,16 +2335,18 @@ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_ */ x_offset = (xscale < 0) ? -width : 0; y_offset = (yscale < 0) ? -height : 0; - set_xrender_transformation(mask_pict, xscale, yscale, x_src, y_src); + set_xrender_transformation(src_pict, xscale, yscale, x_src, y_src); } else { x_offset = x_src; y_offset = y_src; - set_xrender_transformation(mask_pict, 1, 1, 0, 0); + set_xrender_transformation(src_pict, 1, 1, 0, 0); } - pXRenderComposite(gdi_display, PictOpOver, src_pict, mask_pict, dst_pict, + pXRenderComposite(gdi_display, PictOpOver, tile_pict, src_pict, dst_pict, 0, 0, x_offset, y_offset, x_dst, y_dst, width, height ); + wine_tsx11_unlock(); + LeaveCriticalSection( &xrender_cs ); } static void get_colors( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst, @@ -2456,6 +2466,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; + src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + /* mono -> color */ if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) { @@ -2464,35 +2476,16 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr get_colors( physdev_src, physdev_dst, &fg, &bg ); fg.alpha = bg.alpha = 0; - /* We use the source drawable as a mask */ - mask_pict = get_xrender_picture_source( physdev_src, use_repeat ); - - /* Use backgroundPixel as the foreground color */ - EnterCriticalSection( &xrender_cs ); - src_pict = get_tile_pict( physdev_dst->format, &bg ); - - /* Create a destination picture and fill it with textPixel color as the background color */ - wine_tsx11_lock(); - pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, &fg, x_dst, y_dst, width, height ); - - xrender_mono_blit( src_pict, mask_pict, dst_pict, x_src, y_src, - x_dst, y_dst, xscale, yscale, width, height ); - - wine_tsx11_unlock(); - LeaveCriticalSection( &xrender_cs ); + xrender_mono_blit( src_pict, dst_pict, physdev_dst->format, &fg, &bg, + x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); } else /* color -> color (can be at different depths) or mono -> mono */ { if (physdev_dst->x11dev->depth == 32 && physdev_src->x11dev->depth < 32) mask_pict = get_no_alpha_mask(); - src_pict = get_xrender_picture_source( physdev_src, use_repeat ); - - wine_tsx11_lock(); xrender_blit( PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); - - wine_tsx11_unlock(); } if (drawable) @@ -2551,12 +2544,15 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, HRGN clip, if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; - wine_tsx11_lock(); xrender_blit( PictOpSrc, src_pict, 0, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, abs( dst->width ), abs( dst->height )); - if (drawable) pXRenderFreePicture( gdi_display, dst_pict ); - wine_tsx11_unlock(); + if (drawable) + { + wine_tsx11_lock(); + pXRenderFreePicture( gdi_display, dst_pict ); + wine_tsx11_unlock(); + } } @@ -2817,11 +2813,12 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( func.SourceConstantAlpha * 257 ); - wine_tsx11_lock(); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, src->x, src->y, physdev->x11dev->dc_rect.left + dst->x, physdev->x11dev->dc_rect.top + dst->y, xscale, yscale, dst->width, dst->height ); + + wine_tsx11_lock(); pXRenderFreePicture( gdi_display, src_pict ); XFreePixmap( gdi_display, src_pixmap ); wine_tsx11_unlock(); @@ -2893,13 +2890,14 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 ); - wine_tsx11_lock(); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, physdev_src->x11dev->dc_rect.left + src->x, physdev_src->x11dev->dc_rect.top + src->y, physdev_dst->x11dev->dc_rect.left + dst->x, physdev_dst->x11dev->dc_rect.top + dst->y, xscale, yscale, dst->width, dst->height ); + + wine_tsx11_lock(); if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); wine_tsx11_unlock();

1 0

Alexandre Julliard : winex11: Fix handling of 1-bpp source bitmaps in AlphaBlend.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 094d9fe48e6dd343246cc1b2ddda9d0f33517be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094d9fe48e6dd343246cc1b2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 20:23:18 2011 +0200 winex11: Fix handling of 1-bpp source bitmaps in AlphaBlend. --- dlls/winex11.drv/xrender.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 370d5f3..b83a9c9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2845,6 +2845,8 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); Picture dst_pict, src_pict = 0, mask_pict = 0, tmp_pict = 0; + XRenderPictureAttributes pa; + Pixmap tmp_pixmap = 0; double xscale, yscale; BOOL use_repeat; @@ -2867,25 +2869,47 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, } else xscale = yscale = 1; /* no scaling needed with a repeating source */ - if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && physdev_src->format) + src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + + if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) + { + /* mono -> color blending needs an intermediate color pixmap */ + XRenderColor fg, bg; + int width = src->visrect.right - src->visrect.left; + int height = src->visrect.bottom - src->visrect.top; + + /* blending doesn't use the destination DC colors */ + fg.red = fg.green = fg.blue = 0; + bg.red = bg.green = bg.blue = 0xffff; + fg.alpha = bg.alpha = 0xffff; + + wine_tsx11_lock(); + tmp_pixmap = XCreatePixmap( gdi_display, root_window, width, height, + physdev_dst->pict_format->depth ); + pa.repeat = use_repeat ? RepeatNormal : RepeatNone; + tmp_pict = pXRenderCreatePicture( gdi_display, tmp_pixmap, physdev_dst->pict_format, + CPRepeat, &pa ); + wine_tsx11_unlock(); + + xrender_mono_blit( src_pict, tmp_pict, physdev_dst->format, &fg, &bg, + src->visrect.left, src->visrect.top, 0, 0, 1, 1, width, height ); + } + else if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && physdev_src->pict_format) { /* we need a source picture with no alpha */ enum wxr_format format = get_format_without_alpha( physdev_src->format ); if (format != physdev_src->format) { - XRenderPictureAttributes pa; - wine_tsx11_lock(); pa.subwindow_mode = IncludeInferiors; pa.repeat = use_repeat ? RepeatNormal : RepeatNone; tmp_pict = pXRenderCreatePicture( gdi_display, physdev_src->x11dev->drawable, pict_formats[format], CPSubwindowMode|CPRepeat, &pa ); wine_tsx11_unlock(); - src_pict = tmp_pict; } } - if (!src_pict) src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + if (tmp_pict) src_pict = tmp_pict; EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 ); @@ -2899,6 +2923,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_lock(); if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); + if (tmp_pixmap) XFreePixmap( gdi_display, tmp_pixmap ); wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs );

1 0

Alexandre Julliard : winex11: Forward AlphaBlend with a DIB section as source to the null driver.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: ff2805cae00ebf854e2fd80c2a34af18e275180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2805cae00ebf854e2fd80c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 11:35:36 2011 +0200 winex11: Forward AlphaBlend with a DIB section as source to the null driver. --- dlls/winex11.drv/xrender.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b83a9c9..e3fa09a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2856,7 +2856,17 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); } - if (physdev_src != physdev_dst) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + if (physdev_dst != physdev_src) + { + int status = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); + if (status == DIB_Status_AppMod || status == DIB_Status_InSync) + { + X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); + dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); + return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); + } + X11DRV_CoerceDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + } X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect );

1 0

Stefan Dösinger : d3dx9_36/tests: Make sure NaN and negative NaN have the correct sign bits.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: b97b577e9fde609c7c9644e6f189ef84c3a530b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97b577e9fde609c7c9644e6f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 20 22:10:28 2011 +0200 d3dx9_36/tests: Make sure NaN and negative NaN have the correct sign bits. --- dlls/d3dx9_36/tests/math.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c26a523..fcf0a99 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2219,7 +2219,9 @@ static void test_D3DXVec_Array(void) static void test_D3DXFloat_Array(void) { static const float z = 0.0f; - float nnan = 0.0f/z; + /* Compilers set different sign bits on 0.0 / 0.0, pick the right ones for NaN and -NaN */ + float tmpnan = 0.0f/z; + float nnan = copysignf(1, tmpnan) < 0.0f ? tmpnan : -tmpnan; float nan = -nnan; unsigned int i; void *out = NULL;

1 0

Stefan Dösinger : d3dx9_36/tests: Account for NP2 limitations in a texture test.
by Alexandre Julliard 21 Sep '11

21 Sep '11

Module: wine Branch: master Commit: 3b9f88555f222cbded0ce5913f19e6ae5b50e06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9f88555f222cbded0ce5913… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 20 22:18:28 2011 +0200 d3dx9_36/tests: Account for NP2 limitations in a texture test. --- dlls/d3dx9_36/tests/texture.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index c575346..38b87db 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -100,7 +100,10 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) width = caps.MaxTextureWidth-1; hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1); + if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + ok(width == caps.MaxTextureWidth, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth); + else + ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1); /* mipmaps */ width = 64; height = 63;

1 0

Jacek Caban : wshom.ocx: Added WshShell class factory implementation.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 8d7fe3711b4863dc1bbfc03cb516acd44df862d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7fe3711b4863dc1bbfc03cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 11:55:34 2011 +0200 wshom.ocx: Added WshShell class factory implementation. --- .gitignore | 1 + dlls/wshom.ocx/Makefile.in | 2 + dlls/wshom.ocx/shell.c | 29 +++++++++++++++++ dlls/wshom.ocx/wshom_main.c | 66 ++++++++++++++++++++++++++++++++++----- dlls/wshom.ocx/wshom_private.h | 27 ++++++++++++++++ 5 files changed, 116 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b9a7636..8474c43 100644 --- a/.gitignore +++ b/.gitignore @@ -128,6 +128,7 @@ dlls/vbscript/vbscript_classes.h dlls/vbscript/vbsglobal.h dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c +dlls/wshom.ocx/wshom.h include/activaut.h include/activdbg.h include/activscp.h diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 5fb73d5..879cc70 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,10 +1,12 @@ MODULE = wshom.ocx C_SRCS = \ + shell.c \ wshom_main.c RC_SRCS = wshom.rc +IDL_H_SRCS = wshom.idl IDL_TLB_SRCS = wshom.idl @MAKE_DLL_RULES@ diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c new file mode 100644 index 0000000..598ca9a --- /dev/null +++ b/dlls/wshom.ocx/shell.c @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include "wshom_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wshom); + +HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 0266822..2e6016c 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -16,15 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" +#include "initguid.h" +#include "wshom_private.h" +#include "wshom.h" #include "rpcproxy.h" #include "wine/debug.h" @@ -33,6 +27,55 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); static HINSTANCE wshom_instance; +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl WshShellFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WshShellFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory WshShellFactory = { &WshShellFactoryVtbl }; + /****************************************************************** * DllMain (wshom.ocx.@) */ @@ -58,6 +101,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + if(IsEqualGUID(&CLSID_WshShell, rclsid)) { + TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WshShellFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h new file mode 100644 index 0000000..50b84b3 --- /dev/null +++ b/dlls/wshom.ocx/wshom_private.h @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" + +HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wshom.ocx: Added IWshShell3 interface stub implementation.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: cf2a4399472f7c4171c90c05a595828498f2878b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2a4399472f7c4171c90c05a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 11:55:44 2011 +0200 wshom.ocx: Added IWshShell3 interface stub implementation. --- dlls/wshom.ocx/shell.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 598ca9a..9392ff5 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -17,13 +17,110 @@ */ #include "wshom_private.h" +#include "wshom.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); +static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IDispatch)) { + TRACE("(IID_IDispatch %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWshShell3)) { + TRACE("(IID_IWshShell3 %p)\n", ppv); + *ppv = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WshShell3_AddRef(IWshShell3 *iface) +{ + TRACE("()\n"); + return 2; +} + +static ULONG WINAPI WshShell3_Release(IWshShell3 *iface) +{ + TRACE("()\n"); + return 2; +} + +static HRESULT WINAPI WshShell3_GetTypeInfoCount(IWshShell3 *iface, UINT *pctinfo) +{ + TRACE("(%p)\n", pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshShell3_GetTypeInfo(IWshShell3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + FIXME("(%u %u %p)\n", iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_GetIDsOfNames(IWshShell3 *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + FIXME("(%s %p %u %u %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + FIXME("(%d %s %d %d %p %p %p %p)\n", dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_get_SpecialFolders(IWshShell3 *iface, IWshCollection **out_Folders) +{ + FIXME("(%p)\n", out_Folders); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type, IWshEnvironment **out_Env) +{ + FIXME("(%p %p)\n", Type, out_Env); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR Command, VARIANT *WindowStyle, VARIANT *WaitOnReturn, int *out_ExitCode) +{ + FIXME("(%p %p %p)\n", WindowStyle, WaitOnReturn, out_ExitCode); + return E_NOTIMPL; +} + +static const IWshShell3Vtbl WshShell3Vtbl = { + WshShell3_QueryInterface, + WshShell3_AddRef, + WshShell3_Release, + WshShell3_GetTypeInfoCount, + WshShell3_GetTypeInfo, + WshShell3_GetIDsOfNames, + WshShell3_Invoke, + WshShell3_get_SpecialFolders, + WshShell3_get_Environment, + WshShell3_Run +}; + +static IWshShell3 WshShell3 = { &WshShell3Vtbl }; + HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + return IWshShell3_QueryInterface(&WshShell3, riid, ppv); }

1 0

Jacek Caban : wshom.ocx: Added beginning WshShell object tests.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 13fef511b2a3e1503250db237b710137fcda1569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fef511b2a3e1503250db237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 11:55:52 2011 +0200 wshom.ocx: Added beginning WshShell object tests. --- configure | 1 + configure.ac | 1 + dlls/wshom.ocx/tests/Makefile.in | 7 ++++ dlls/wshom.ocx/tests/wshom.c | 59 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f18a7b7..ae33294 100755 --- a/configure +++ b/configure @@ -15184,6 +15184,7 @@ wine_fn_config_dll wow32 enable_win16 implib wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test wine_fn_config_dll wshom.ocx enable_wshom_ocx +wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test wine_fn_config_dll wsock32 enable_wsock32 implib wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_dll wuapi enable_wuapi diff --git a/configure.ac b/configure.ac index e12fb37..1401072 100644 --- a/configure.ac +++ b/configure.ac @@ -2877,6 +2877,7 @@ WINE_CONFIG_DLL(wow32,enable_win16,[implib]) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) WINE_CONFIG_DLL(wshom.ocx) +WINE_CONFIG_TEST(dlls/wshom.ocx/tests) WINE_CONFIG_DLL(wsock32,,[implib]) WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_DLL(wuapi) diff --git a/dlls/wshom.ocx/tests/Makefile.in b/dlls/wshom.ocx/tests/Makefile.in new file mode 100644 index 0000000..90094fb --- /dev/null +++ b/dlls/wshom.ocx/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = wshom.ocx +IMPORTS = ole32 + +C_SRCS = \ + wshom.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c new file mode 100644 index 0000000..f9768b9 --- /dev/null +++ b/dlls/wshom.ocx/tests/wshom.c @@ -0,0 +1,59 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 +#define CONST_VTABLE + +#include <initguid.h> +#include <ole2.h> +#include <dispex.h> + +#include "wine/test.h" + +DEFINE_GUID(CLSID_WshShell, 0x72c24dd5, 0xd70a, 0x438b, 0x8a,0x42, 0x98,0x42,0x4b,0x88,0xaf,0xb8); + +DEFINE_GUID(IID_IWshShell3, 0x41904400, 0xbe18, 0x11d3, 0xa2,0x8b, 0x00,0x10,0x4b,0xd3,0x50,0x90); + +static void test_wshshell(void) +{ + IDispatch *disp; + IUnknown *shell; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) { + win_skip("Could not create WshShell object: %08x\n", hres); + return; + } + + hres = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); + IDispatch_Release(disp); + ok(hres == S_OK, "Could not get IWshShell3 iface: %08x\n", hres); + + IUnknown_Release(shell); +} + +START_TEST(wshom) +{ + CoInitialize(NULL); + + test_wshshell(); + + CoUninitialize(); +}

1 0