February 2013 - Wine-commits

Daniel Jelinski : comctl32/listview: Fix LVM_SETICONSPACING on 64bit machines.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 77874d7863dc92907452615823e8b038690ced5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77874d7863dc9290745261582… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:57:58 2013 +0100 comctl32/listview: Fix LVM_SETICONSPACING on 64bit machines. --- dlls/comctl32/listview.c | 4 +++- dlls/comctl32/tests/listview.c | 21 ++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1274d15..a22b2da 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11468,7 +11468,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetHoverTime(infoPtr, (DWORD)lParam); case LVM_SETICONSPACING: - return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); + if(lParam == -1) + return LISTVIEW_SetIconSpacing(infoPtr, -1, -1); + return LISTVIEW_SetIconSpacing(infoPtr, LOWORD(lParam), HIWORD(lParam)); case LVM_SETIMAGELIST: return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 98ca495..fef3f60 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4654,11 +4654,26 @@ static void test_getitemspacing(void) ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); expect(100, LOWORD(ret)); - expect(0xFFFF, HIWORD(ret)); - ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); - expect(100, LOWORD(ret)); expect(0xFFFF, HIWORD(ret)); + + if (sizeof(void*) == 8) + { + /* NOTE: -1 is not treated the same as (DWORD)-1 by 64bit listview */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, (DWORD)-1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(0xFFFF, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + } + else + { + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + } ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret));

1 0

Alexandre Julliard : server: Also exclude the top-level client rectangle for windows that have a pixel format .
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: ca5746ad1a99fde06a7309cc47031cc898c6ee69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5746ad1a99fde06a7309cc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 15:41:20 2013 +0100 server: Also exclude the top-level client rectangle for windows that have a pixel format. --- dlls/winex11.drv/bitblt.c | 1 + server/window.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e52fbc2..2fc7c94 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2029,6 +2029,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co } surface->gc = XCreateGC( gdi_display, window, 0, NULL ); + XSetSubwindowMode( gdi_display, surface->gc, IncludeInferiors ); surface->byteswap = image_needs_byteswap( surface->image, is_r8g8b8(vis), format->bits_per_pixel ); if (surface->byteswap || format->bits_per_pixel == 4 || format->bits_per_pixel == 8) diff --git a/server/window.c b/server/window.c index a460a7c..fbe522a 100644 --- a/server/window.c +++ b/server/window.c @@ -1084,6 +1084,9 @@ static struct region *get_surface_region( struct window *win ) set_region_rect( clip, &win->client_rect ); if (win->win_region && !intersect_window_region( clip, win )) goto error; + if ((win->paint_flags & PAINT_HAS_PIXEL_FORMAT) && !subtract_region( region, region, clip )) + goto error; + /* clip children */ if (!is_desktop_window(win)) @@ -2264,7 +2267,7 @@ DECL_HANDLER(set_window_pos) top = get_top_clipping_window( win ); if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE) && - (top->paint_flags & PAINT_PIXEL_FORMAT_CHILD)) + (top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD))) reply->surface_win = top->handle; }

1 0

Alexandre Julliard : server: Return the window paint flags in the get_visible_region request.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: bc602c3060692f3c6e9b1cca2a3eaa9299f4d6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc602c3060692f3c6e9b1cca2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 17:14:17 2013 +0100 server: Return the window paint flags in the get_visible_region request. --- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 5 +++-- server/trace.c | 1 + server/window.c | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 99bcfae..8a8a0ed 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3415,8 +3415,10 @@ struct get_visible_region_reply user_handle_t top_win; rectangle_t top_rect; rectangle_t win_rect; + unsigned int paint_flags; data_size_t total_size; /* VARARG(region,rectangles); */ + char __pad_52[4]; }; @@ -5715,6 +5717,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 438 +#define SERVER_PROTOCOL_VERSION 439 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4038e48..7bb679a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2460,6 +2460,7 @@ enum coords_relative user_handle_t top_win; /* top window to clip against */ rectangle_t top_rect; /* top window visible rect with screen coords */ rectangle_t win_rect; /* window rect in screen coords */ + unsigned int paint_flags; /* paint flags (from SET_WINPOS_* flags) */ data_size_t total_size; /* total size of the resulting region */ VARARG(region,rectangles); /* list of rectangles for the region (in screen coords) */ @END diff --git a/server/request.h b/server/request.h index f566e0d..b1b816f 100644 --- a/server/request.h +++ b/server/request.h @@ -1626,8 +1626,9 @@ C_ASSERT( sizeof(struct get_visible_region_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, top_win) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, top_rect) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, win_rect) == 28 ); -C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, total_size) == 44 ); -C_ASSERT( sizeof(struct get_visible_region_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, paint_flags) == 44 ); +C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, total_size) == 48 ); +C_ASSERT( sizeof(struct get_visible_region_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_surface_region_request, window) == 12 ); C_ASSERT( sizeof(struct get_surface_region_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_surface_region_reply, visible_rect) == 8 ); diff --git a/server/trace.c b/server/trace.c index 41c5424..c7a13d8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2926,6 +2926,7 @@ static void dump_get_visible_region_reply( const struct get_visible_region_reply fprintf( stderr, " top_win=%08x", req->top_win ); dump_rectangle( ", top_rect=", &req->top_rect ); dump_rectangle( ", win_rect=", &req->win_rect ); + fprintf( stderr, ", paint_flags=%08x", req->paint_flags ); fprintf( stderr, ", total_size=%u", req->total_size ); dump_varargs_rectangles( ", region=", cur_size ); } diff --git a/server/window.c b/server/window.c index fbe522a..e141f93 100644 --- a/server/window.c +++ b/server/window.c @@ -2434,6 +2434,7 @@ DECL_HANDLER(get_visible_region) reply->win_rect.right = win->client_rect.right - win->client_rect.left; reply->win_rect.bottom = win->client_rect.bottom - win->client_rect.top; } + reply->paint_flags = win->paint_flags & PAINT_CLIENT_FLAGS; }

1 0

Alexandre Julliard : user32: Don' t paint to the surface if the window has a pixel format, regardless of the state of the top parent.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 0cc78d97c15eb26c791c990f7e27dbe679989c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc78d97c15eb26c791c990f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 17:49:22 2013 +0100 user32: Don't paint to the surface if the window has a pixel format, regardless of the state of the top parent. --- dlls/user32/painting.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index a6fb23f..ee84689 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -113,6 +113,7 @@ static void update_visible_region( struct dce *dce ) HRGN vis_rgn = 0; HWND top_win = 0; DWORD flags = dce->flags; + DWORD paint_flags = 0; size_t size = 256; RECT win_rect, top_rect; WND *win; @@ -149,6 +150,7 @@ static void update_visible_region( struct dce *dce ) top_rect.top = reply->top_rect.top; top_rect.right = reply->top_rect.right; top_rect.bottom = reply->top_rect.bottom; + paint_flags = reply->paint_flags; } else size = reply->total_size; } @@ -163,12 +165,16 @@ static void update_visible_region( struct dce *dce ) if (dce->clip_rgn) CombineRgn( vis_rgn, vis_rgn, dce->clip_rgn, (flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF ); - if ((win = WIN_GetPtr( top_win )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS) + /* don't use a surface to paint the client area of OpenGL windows */ + if (!(paint_flags & SET_WINPOS_PIXEL_FORMAT) || (flags & DCX_WINDOW)) { - /* don't use a surface to paint the client area of OpenGL windows */ - if (!win->pixel_format || (flags & DCX_WINDOW)) surface = win->surface; - if (surface) window_surface_add_ref( surface ); - WIN_ReleasePtr( win ); + win = WIN_GetPtr( top_win ); + if (win && win != WND_DESKTOP && win != WND_OTHER_PROCESS) + { + surface = win->surface; + if (surface) window_surface_add_ref( surface ); + WIN_ReleasePtr( win ); + } } if (!surface) top_rect = get_virtual_screen_rect();

1 0

Hans Leidekker : windowscodecsext: Implement WICCreateColorTransform_Proxy and IWICColorTransform_Initialize_Proxy .
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: e002d2eacfc5371bc4a964515448c9ad2db52e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e002d2eacfc5371bc4a964515… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 11 14:30:10 2013 +0100 windowscodecsext: Implement WICCreateColorTransform_Proxy and IWICColorTransform_Initialize_Proxy. --- configure | 3 +- configure.ac | 3 +- dlls/windowscodecsext/Makefile.in | 2 + dlls/windowscodecsext/main.c | 40 +++++++++++++++++ dlls/windowscodecsext/tests/Makefile.in | 7 +++ dlls/windowscodecsext/tests/transform.c | 64 +++++++++++++++++++++++++++ dlls/windowscodecsext/windowscodecsext.spec | 4 +- 7 files changed, 119 insertions(+), 4 deletions(-) diff --git a/configure b/configure index c5fabba..2998c6a 100755 --- a/configure +++ b/configure @@ -16184,7 +16184,8 @@ wine_fn_config_dll winaspi.dll16 enable_win16 wine_fn_config_dll windebug.dll16 enable_win16 wine_fn_config_dll windowscodecs enable_windowscodecs implib wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test -wine_fn_config_dll windowscodecsext enable_windowscodecsext +wine_fn_config_dll windowscodecsext enable_windowscodecsext implib +wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test wine_fn_config_dll winealsa.drv enable_winealsa_drv wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 diff --git a/configure.ac b/configure.ac index 012228c..d6fccaa 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,7 +3068,8 @@ WINE_CONFIG_DLL(winaspi.dll16,enable_win16) WINE_CONFIG_DLL(windebug.dll16,enable_win16) WINE_CONFIG_DLL(windowscodecs,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecs/tests) -WINE_CONFIG_DLL(windowscodecsext) +WINE_CONFIG_DLL(windowscodecsext,,[implib]) +WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) diff --git a/dlls/windowscodecsext/Makefile.in b/dlls/windowscodecsext/Makefile.in index de6d06c..edb9b7d 100644 --- a/dlls/windowscodecsext/Makefile.in +++ b/dlls/windowscodecsext/Makefile.in @@ -1,4 +1,6 @@ MODULE = windowscodecsext.dll +IMPORTLIB = windowscodecsext +IMPORTS = ole32 C_SRCS = \ main.c diff --git a/dlls/windowscodecsext/main.c b/dlls/windowscodecsext/main.c index 608096e..d7f74ff 100644 --- a/dlls/windowscodecsext/main.c +++ b/dlls/windowscodecsext/main.c @@ -22,8 +22,12 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" +#include "initguid.h" +#include "wincodec.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -45,3 +49,39 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT WINAPI WICCreateColorTransform_Proxy(IWICColorTransform **ppIWICColorTransform) +{ + HRESULT hr, init; + IWICImagingFactory *factory; + + TRACE("(%p)\n", ppIWICColorTransform); + + if (!ppIWICColorTransform) return E_INVALIDARG; + + init = CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (FAILED(hr)) + { + if (SUCCEEDED(init)) CoUninitialize(); + return hr; + } + hr = IWICImagingFactory_CreateColorTransformer(factory, ppIWICColorTransform); + IWICImagingFactory_Release(factory); + + if (SUCCEEDED(init)) CoUninitialize(); + return hr; +} + +HRESULT WINAPI IWICColorTransform_Initialize_Proxy_W(IWICColorTransform *iface, + IWICBitmapSource *pIBitmapSource, IWICColorContext *pIContextSource, + IWICColorContext *pIContextDest, REFWICPixelFormatGUID pixelFmtDest) +{ + TRACE("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, pIContextDest, + debugstr_guid(pixelFmtDest)); + + return IWICColorTransform_Initialize(iface, pIBitmapSource, pIContextSource, + pIContextDest, pixelFmtDest); +} diff --git a/dlls/windowscodecsext/tests/Makefile.in b/dlls/windowscodecsext/tests/Makefile.in new file mode 100644 index 0000000..9d005aa --- /dev/null +++ b/dlls/windowscodecsext/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = windowscodecsext.dll +IMPORTS = windowscodecsext ole32 + +C_SRCS = \ + transform.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/windowscodecsext/tests/transform.c b/dlls/windowscodecsext/tests/transform.c new file mode 100644 index 0000000..e76f9fe --- /dev/null +++ b/dlls/windowscodecsext/tests/transform.c @@ -0,0 +1,64 @@ +/* + * Copyright 2013 Hans Leidekker 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 + +#include <stdio.h> +#include "windows.h" +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +HRESULT WINAPI WICCreateColorTransform_Proxy(IWICColorTransform**); + +static void test_WICCreateColorTransform_Proxy(void) +{ + HRESULT hr; + IWICColorTransform *transform; + + hr = WICCreateColorTransform_Proxy( NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + + hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); + ok( hr == S_OK, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + CoUninitialize(); + + hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); + ok( hr == S_OK, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + CoUninitialize(); +} + +START_TEST(transform) +{ + test_WICCreateColorTransform_Proxy(); +} diff --git a/dlls/windowscodecsext/windowscodecsext.spec b/dlls/windowscodecsext/windowscodecsext.spec index d6b0e2b..02cfd9b 100644 --- a/dlls/windowscodecsext/windowscodecsext.spec +++ b/dlls/windowscodecsext/windowscodecsext.spec @@ -1,3 +1,3 @@ @ stub DllGetClassObject -@ stub IWICColorTransform_Initialize_Proxy -@ stub WICCreateColorTransform_Proxy +@ stdcall IWICColorTransform_Initialize_Proxy(ptr ptr ptr ptr ptr) IWICColorTransform_Initialize_Proxy_W +@ stdcall WICCreateColorTransform_Proxy(ptr)

1 0

Hans Leidekker : windowscodecs: Implement IWICBitmapFrameDecode:: GetColorContexts for TIFF images.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: d8c71dd5ed80111c401382dc9dd6c5a218148ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c71dd5ed80111c401382dc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 11 14:30:35 2013 +0100 windowscodecs: Implement IWICBitmapFrameDecode::GetColorContexts for TIFF images. --- dlls/windowscodecs/tiffformat.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 8cebb0c..0fcb81a 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1105,8 +1105,34 @@ static HRESULT WINAPI TiffFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDeco static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + TiffFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + const BYTE *profile; + UINT len; + HRESULT hr; + + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + + EnterCriticalSection(&This->parent->lock); + + if (pTIFFGetField(This->parent->tiff, TIFFTAG_ICCPROFILE, &len, &profile)) + { + if (cCount && ppIColorContexts) + { + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->parent->lock); + return hr; + } + } + *pcActualCount = 1; + } + else + *pcActualCount = 0; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface,

1 0

Francois Gouget : kernel32/tests: Reduce the size of the console buffer to speed up the tests.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: c2a5b04d01882668f433e74bcaf4ff1c11be4167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a5b04d01882668f433e74bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 11 15:36:15 2013 +0100 kernel32/tests: Reduce the size of the console buffer to speed up the tests. --- dlls/kernel32/tests/console.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b1907d7..df752f4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2608,6 +2608,18 @@ START_TEST(console) ok(ret, "Getting sb info\n"); if (!ret) return; + /* Reduce the size of the buffer to the visible area plus 3 lines to speed + * up the tests. + */ + trace("Visible area: %dx%d - %dx%d Buffer size: %dx%d\n", sbi.srWindow.Left, sbi.srWindow.Top, sbi.srWindow.Right, sbi.srWindow.Bottom, sbi.dwSize.X, sbi.dwSize.Y); + sbi.dwSize.Y = size = (sbi.srWindow.Bottom + 1) + 3; + ret = SetConsoleScreenBufferSize(hConOut, sbi.dwSize); + ok(ret, "Setting sb info\n"); + ret = GetConsoleScreenBufferInfo(hConOut, &sbi); + ok(ret, "Getting sb info\n"); + ok(sbi.dwSize.Y == size, "Unexpected buffer size: %d instead of %d\n", sbi.dwSize.Y, size); + if (!ret) return; + /* Non interactive tests */ testCursor(hConOut, sbi.dwSize); /* test parameters (FIXME: test functionality) */

1 0

Francois Gouget : rpcrt4/tests: Trace the GUID when it is wrong.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 138f119705597956d8a6d87c656bf34e70b3ce43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138f119705597956d8a6d87c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 11 15:36:36 2013 +0100 rpcrt4/tests: Trace the GUID when it is wrong. --- dlls/rpcrt4/tests/rpc.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 739a00e..988b5c3 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -814,6 +814,7 @@ static void test_UuidCreateSequential(void) if (version == 1) { UUID guid2; + char buf[39]; if (!ret) { @@ -821,7 +822,8 @@ static void test_UuidCreateSequential(void) * address in the uuid: */ ok(!(guid1.Data4[2] & 0x01), - "GUID does not appear to contain a MAC address\n"); + "GUID does not appear to contain a MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid1)); } else { @@ -829,7 +831,8 @@ static void test_UuidCreateSequential(void) * address in the uuid: */ ok((guid1.Data4[2] & 0x01), - "GUID does not appear to contain a multicast MAC address\n"); + "GUID does not appear to contain a multicast MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid1)); } /* Generate another GUID, and make sure its MAC address matches the * first. @@ -840,7 +843,8 @@ static void test_UuidCreateSequential(void) version = (guid2.Data3 & 0xf000) >> 12; ok(version == 1, "unexpected version %d\n", version); ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), - "unexpected value in MAC address\n"); + "unexpected value in MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid2)); } }

1 0

Nikolay Sivov : oledb32: Add a table of init properties, support Persist Security Info switch in init string.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 461c09e5d6c66c73746d7e1e68e5fe49a7462cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461c09e5d6c66c73746d7e1e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 10 20:01:23 2013 +0400 oledb32: Add a table of init properties, support Persist Security Info switch in init string. --- dlls/oledb32/datainit.c | 87 ++++++++++++++++++++++++++++++++++------- dlls/oledb32/tests/database.c | 5 +- 2 files changed, 76 insertions(+), 16 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index aa61d3b..d979846 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -289,30 +289,89 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset) CoTaskMemFree(propset); } +struct dbproperty { + const WCHAR *name; + DBPROPID id; + DBPROPOPTIONS options; + VARTYPE type; +}; + +static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; +static const WCHAR persistsiW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; + +static const struct dbproperty dbproperties[] = { + { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { persistsiW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL } +}; + static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) { - static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; + VARIANT src, dest; + int min, max, n; + HRESULT hr; + + min = 0; + max = sizeof(dbproperties)/sizeof(struct dbproperty) - 1; - if (!strcmpW(datasourceW, name)) + while (min <= max) { - *propset = CoTaskMemAlloc(sizeof(DBPROPSET)); - (*propset)->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); - (*propset)->cProperties = 1; - (*propset)->guidPropertySet = DBPROPSET_DBINIT; - (*propset)->rgProperties[0].dwPropertyID = DBPROP_INIT_DATASOURCE; - (*propset)->rgProperties[0].dwOptions = DBPROPOPTIONS_REQUIRED; - (*propset)->rgProperties[0].dwStatus = 0; - memset(&(*propset)->rgProperties[0].colid, 0, sizeof(DBID)); - V_VT(&(*propset)->rgProperties[0].vValue) = VT_BSTR; - V_BSTR(&(*propset)->rgProperties[0].vValue) = SysAllocString(value); - return S_OK; + int r; + + n = (min+max)/2; + + r = strcmpW(dbproperties[n].name, name); + if (!r) + break; + + if (r < 0) + min = n+1; + else + max = n-1; } - else + + if (min > max) { *propset = NULL; FIXME("unsupported property %s\n", debugstr_w(name)); return E_FAIL; } + + VariantInit(&dest); + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = value; + + hr = VariantChangeType(&dest, &src, 0, dbproperties[n].type); + if (FAILED(hr)) + { + ERR("failed to init property %s value as type %d\n", debugstr_w(name), dbproperties[n].type); + return hr; + } + + *propset = CoTaskMemAlloc(sizeof(DBPROPSET)); + if (!*propset) + { + VariantClear(&dest); + return E_OUTOFMEMORY; + } + + (*propset)->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); + if (!(*propset)->rgProperties) + { + VariantClear(&dest); + CoTaskMemFree(*propset); + return E_OUTOFMEMORY; + } + + (*propset)->cProperties = 1; + (*propset)->guidPropertySet = DBPROPSET_DBINIT; + (*propset)->rgProperties[0].dwPropertyID = dbproperties[n].id; + (*propset)->rgProperties[0].dwOptions = dbproperties[n].options; + (*propset)->rgProperties[0].dwStatus = 0; + memset(&(*propset)->rgProperties[0].colid, 0, sizeof(DBID)); + (*propset)->rgProperties[0].vValue = dest; + + return S_OK; } /*** IDataInitialize methods ***/ diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 4d3694c..d744c86 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -59,12 +59,13 @@ static void test_database(void) { static WCHAR initstring_jet[] = {'P','r','o','v','i','d','e','r','=','M','i','c','r','o','s','o','f','t','.', 'J','e','t','.','O','L','E','D','B','.','4','.','0',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', + 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; - hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize, (void**)&datainit); if (FAILED(hr)) { win_skip("Unable to load oledb library\n");

1 0

Detlef Riekenberg : advapi32/tests: Skip tests on non-English systems.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 245dbaac5ddeb5458f70b2ed6c13d100ebfadc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=245dbaac5ddeb5458f70b2ed6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 10 23:19:47 2013 +0100 advapi32/tests: Skip tests on non-English systems. --- dlls/advapi32/tests/lsa.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index d03d9d6..bffb7c0 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -255,7 +255,8 @@ static void test_LsaLookupNames2(void) return; } - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) { skip("Non-English locale (skipping LsaLookupNames2 tests)\n"); return;

1 0