September 2016 - Wine-commits

Sebastian Lackner : jscript: Fix definition of JSSTR_MAX_LENGTH.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: d36ae568c186a9eee944ddf191b2c42088f0d59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36ae568c186a9eee944ddf19… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 5 16:55:57 2016 +0200 jscript: Fix definition of JSSTR_MAX_LENGTH. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 48fa2be..a14acc3 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -39,7 +39,7 @@ struct _jsstr_t { }; #define JSSTR_LENGTH_SHIFT 4 -#define JSSTR_MAX_LENGTH (1 << (32-JSSTR_LENGTH_SHIFT)) +#define JSSTR_MAX_LENGTH ((1 << (32-JSSTR_LENGTH_SHIFT))-1) #define JSSTR_FLAGS_MASK ((1 << JSSTR_LENGTH_SHIFT)-1) #define JSSTR_FLAG_LBIT 1

1 0

Jacek Caban : msctf: Added IID_ITfThreadFocusSink support to AdviseSink.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 63859e382f499828ef9d96d3d06bc2c3f7e52b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63859e382f499828ef9d96d3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 13:57:54 2016 +0200 msctf: Added IID_ITfThreadFocusSink support to AdviseSink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 528414f..aa838da 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -615,6 +615,12 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, if (IsEqualIID(riid, &IID_ITfThreadMgrEventSink)) return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + if (IsEqualIID(riid, &IID_ITfThreadFocusSink)) + { + WARN("semi-stub for ITfThreadFocusSink: sink won't be used.\n"); + return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + } + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); return E_NOTIMPL; }

1 0

Henri Verbeet : d3drm/tests: Fix some reference leaks.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: f41db1a1637b4b5aff9bcf0dd75ae45305690177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41db1a1637b4b5aff9bcf0dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 5 12:50:15 2016 +0200 d3drm/tests: Fix some reference leaks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0d92823..85af6d2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6273,6 +6273,7 @@ static void test_viewport_clear1(void) IDirect3DRMDevice_Release(device1); IDirect3DRM_Release(d3drm1); IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); } @@ -6518,10 +6519,9 @@ static void test_viewport_clear2(void) ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); IDirectDrawSurface_Release(surface); + IDirect3DRMViewport2_Release(viewport2); IDirect3DRMDevice3_Release(device3); IDirect3DDevice2_Release(d3d_device2); - IDirect3D2_Release(d3d2); - IDirectDraw2_Release(ddraw2); cleanup: IDirect3DRMFrame3_Release(camera3); @@ -6529,6 +6529,9 @@ cleanup: IDirect3DRM3_Release(d3drm3); IDirect3DRM_Release(d3drm1); IDirectDrawClipper_Release(clipper); + IDirect3D2_Release(d3d2); + IDirectDraw2_Release(ddraw2); + IDirectDraw_Release(ddraw1); DestroyWindow(window); }

1 0

Huw Davies : user32/tests: ValidateRect(NULL, &rect) on >= Win 8 no longer invalidates all windows.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 1c70de2a340640a85eda21ce7987f36ec43bb435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c70de2a340640a85eda21ce7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 5 10:45:11 2016 +0100 user32/tests: ValidateRect(NULL, &rect) on >= Win 8 no longer invalidates all windows. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ebd1c45..d4ca828 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6709,7 +6709,8 @@ static void test_paint_messages(void) */ trace("testing ValidateRect(0, NULL)\n"); SetRectEmpty( &rect ); - if (ValidateRect(0, &rect)) /* not supported on Win9x */ + if (ValidateRect(0, &rect) && /* not supported on Win9x */ + GetUpdateRect(hwnd, NULL, FALSE)) /* or >= Win 8 */ { check_update_rgn( hwnd, hrgn ); ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE );

1 0

Huw Davies : user32/tests: On Win 8 and later, moving a window off-screen doesn't crop its update region.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 5942625a003f5f01a31b05561ca91d9f2fc1b486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5942625a003f5f01a31b05561… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 5 10:45:12 2016 +0100 user32/tests: On Win 8 and later, moving a window off-screen doesn't crop its update region. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d4ca828..72614eb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6644,7 +6644,7 @@ static const struct message WmSetParentStyle[] = { static void test_paint_messages(void) { BOOL ret; - RECT rect; + RECT rect, rect2; POINT pt; MSG msg; HWND hparent, hchild; @@ -7184,15 +7184,21 @@ static void test_paint_messages(void) SetRectRgn( hrgn, 10, 10, 40, 40 ); check_update_rgn( hchild, hrgn ); MoveWindow( hparent, -20, -20, 200, 200, FALSE ); - SetRectRgn( hrgn, 20, 20, 100, 100 ); + GetUpdateRect( hparent, &rect2, FALSE ); + if (!EqualRect( &rect2, &rect )) /* Win 8 and later don't crop update to screen */ + { + rect.left += 20; + rect.top += 20; + } + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); check_update_rgn( hparent, hrgn ); - SetRectRgn( hrgn, 30, 30, 40, 40 ); + SetRectRgn( hrgn, rect.left + 10, rect.top + 10, 40, 40 ); check_update_rgn( hchild, hrgn ); /* invalidated region is cropped by the parent rects */ SetRect( &rect, 0, 0, 50, 50 ); RedrawWindow( hchild, &rect, 0, RDW_INVALIDATE | RDW_ERASE ); - SetRectRgn( hrgn, 30, 30, 50, 50 ); + SetRectRgn( hrgn, rect2.left + 10, rect2.top + 10, 50, 50 ); check_update_rgn( hchild, hrgn ); DestroyWindow( hparent );

1 0

Aric Stewart : winebus.sys: Add stub driver.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: f839f1f8aadac5d7853044537f22a127f20d6487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f839f1f8aadac5d7853044537… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 1 15:18:17 2016 +0200 winebus.sys: Add stub driver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/winebus.sys/Makefile.in | 5 +++++ dlls/winebus.sys/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/winebus.sys.spec | 1 + loader/wine.inf.in | 14 ++++++++++++++ 6 files changed, 61 insertions(+) diff --git a/configure b/configure index a7eac8d..da08e8f 100755 --- a/configure +++ b/configure @@ -1383,6 +1383,7 @@ enable_wimgapi enable_windowscodecs enable_windowscodecsext enable_winealsa_drv +enable_winebus_sys enable_winecoreaudio_drv enable_wined3d enable_winegstreamer @@ -18148,6 +18149,7 @@ wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test 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 winebus.sys enable_winebus_sys wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib diff --git a/configure.ac b/configure.ac index 0331c36..0154baa 100644 --- a/configure.ac +++ b/configure.ac @@ -3368,6 +3368,7 @@ WINE_CONFIG_TEST(dlls/windowscodecs/tests) WINE_CONFIG_DLL(windowscodecsext,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) +WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in new file mode 100644 index 0000000..d646dc3 --- /dev/null +++ b/dlls/winebus.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = winebus.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c new file mode 100644 index 0000000..d495cd9 --- /dev/null +++ b/dlls/winebus.sys/main.c @@ -0,0 +1,38 @@ +/* + * WINE Platform native bus driver + * + * Copyright 2016 Aric Stewart + * + * 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> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(plugplay); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/dlls/winebus.sys/winebus.sys.spec b/dlls/winebus.sys/winebus.sys.spec new file mode 100644 index 0000000..76421d7 --- /dev/null +++ b/dlls/winebus.sys/winebus.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f611ea0..4e29026 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -130,6 +130,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineBus,0,WineBusService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -144,6 +145,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineBus,0,WineBusService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -158,6 +160,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService +AddService=WineBus,0,WineBusService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2518,6 +2521,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,mountmgr.sys,- 12,,ndis.sys,- 12,,tdi.sys,- +12,,winebus.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2560,6 +2564,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,mountmgr.sys 12,,ndis.sys 12,,tdi.sys +12,,winebus.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -3176,6 +3181,15 @@ ServiceType=32 StartType=3 ErrorControl=1 +[WineBusService] +Description="Wine Platform Bus Kernel" +DisplayName="Platform Bus Kernel" +ServiceBinary="%12%\winebus.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 + [SpoolerService] Description="Loads files to memory for later printing" DisplayName="Print Spooler"

1 0

Alexandre Julliard : user32: Implement GetUpdatedClipboardFormats.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: fa06ecbfceac64bf979f0d08550af0677e2a8b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa06ecbfceac64bf979f0d085… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 15:35:49 2016 +0900 user32: Implement GetUpdatedClipboardFormats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 30 +++++++++++ dlls/user32/tests/clipboard.c | 113 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 145 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 8e53a9f..8ca4dd5 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -407,6 +407,36 @@ BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat) /************************************************************************** + * GetUpdatedClipboardFormats (USER32.@) + */ +BOOL WINAPI GetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) +{ + UINT i = 0, cf = 0; + + if (!out_size) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + if (!(*out_size = CountClipboardFormats())) return TRUE; /* nothing else to do */ + + if (!formats) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + if (size < *out_size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + /* FIXME: format list could change in the meantime */ + while ((cf = USER_Driver->pEnumClipboardFormats( cf ))) formats[i++] = cf; + return TRUE; +} + + +/************************************************************************** * GetClipboardData (USER32.@) */ HANDLE WINAPI GetClipboardData(UINT wFormat) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 845e5e4..cf6d744 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -29,6 +29,7 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static BOOL (WINAPI *pRemoveClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); +static BOOL (WINAPI *pGetUpdatedClipboardFormats)( UINT *formats, UINT count, UINT *out_count ); static const BOOL is_win64 = sizeof(void *) > sizeof(int); static int thread_from_line; @@ -1806,6 +1807,116 @@ static void test_data_handles(void) DestroyWindow( hwnd ); } +static void test_GetUpdatedClipboardFormats(void) +{ + BOOL r; + UINT count, formats[256]; + + if (!pGetUpdatedClipboardFormats) + { + win_skip( "GetUpdatedClipboardFormats not supported\n" ); + return; + } + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( NULL, 0, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( !count, "wrong count %u\n", count ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( NULL, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( !count, "wrong count %u\n", count ); + + SetLastError( 0xdeadbeef ); + r = pGetUpdatedClipboardFormats( formats, 256, NULL ); + ok( !r, "succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( !count, "wrong count %u\n", count ); + + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( !count, "wrong count %u\n", count ); + + SetClipboardData( CF_UNICODETEXT, 0 ); + + count = 0xdeadbeef; + memset( formats, 0xcc, sizeof(formats) ); + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( count == 1, "wrong count %u\n", count ); + ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); + ok( formats[1] == 0xcccccccc, "wrong format %u\n", formats[1] ); + + SetClipboardData( CF_TEXT, 0 ); + count = 0xdeadbeef; + memset( formats, 0xcc, sizeof(formats) ); + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( count == 2, "wrong count %u\n", count ); + ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); + ok( formats[1] == CF_TEXT, "wrong format %u\n", formats[1] ); + ok( formats[2] == 0xcccccccc, "wrong format %u\n", formats[2] ); + + SetLastError( 0xdeadbeef ); + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( formats, 0, &count ); + ok( !r, "succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + ok( count == 2, "wrong count %u\n", count ); + + SetLastError( 0xdeadbeef ); + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( formats, 1, &count ); + ok( !r, "succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + ok( count == 2, "wrong count %u\n", count ); + + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + count = 0xdeadbeef; + memset( formats, 0xcc, sizeof(formats) ); + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + todo_wine ok( count == 4, "wrong count %u\n", count ); + ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); + ok( formats[1] == CF_TEXT, "wrong format %u\n", formats[1] ); + todo_wine ok( formats[2] == CF_LOCALE, "wrong format %u\n", formats[2] ); + todo_wine ok( formats[3] == CF_OEMTEXT, "wrong format %u\n", formats[3] ); + ok( formats[4] == 0xcccccccc, "wrong format %u\n", formats[4] ); + + count = 0xdeadbeef; + memset( formats, 0xcc, sizeof(formats) ); + r = pGetUpdatedClipboardFormats( formats, 2, &count ); + ok( !r, "gle %d\n", GetLastError() ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + todo_wine ok( count == 4, "wrong count %u\n", count ); + ok( formats[0] == 0xcccccccc, "wrong format %u\n", formats[0] ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( NULL, 256, &count ); + ok( !r, "gle %d\n", GetLastError() ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + todo_wine ok( count == 4, "wrong count %u\n", count ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( NULL, 256, &count ); + ok( !r, "gle %d\n", GetLastError() ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + todo_wine ok( count == 4, "wrong count %u\n", count ); +} + START_TEST(clipboard) { char **argv; @@ -1816,6 +1927,7 @@ START_TEST(clipboard) pAddClipboardFormatListener = (void *)GetProcAddress( mod, "AddClipboardFormatListener" ); pRemoveClipboardFormatListener = (void *)GetProcAddress( mod, "RemoveClipboardFormatListener" ); pGetClipboardSequenceNumber = (void *)GetProcAddress( mod, "GetClipboardSequenceNumber" ); + pGetUpdatedClipboardFormats = (void *)GetProcAddress( mod, "GetUpdatedClipboardFormats" ); if (argc == 4 && !strcmp( argv[2], "set_clipboard_data" )) { @@ -1838,4 +1950,5 @@ START_TEST(clipboard) test_synthesized(); test_messages(); test_data_handles(); + test_GetUpdatedClipboardFormats(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index aa10a80..65a5bfe 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -374,6 +374,7 @@ @ stdcall GetTopWindow(long) @ stdcall GetUpdateRect(long ptr long) @ stdcall GetUpdateRgn(long long long) +@ stdcall GetUpdatedClipboardFormats(ptr long ptr) @ stdcall GetUserObjectInformationA (long long ptr long ptr) @ stdcall GetUserObjectInformationW (long long ptr long ptr) @ stdcall GetUserObjectSecurity (long ptr ptr long ptr) diff --git a/include/winuser.h b/include/winuser.h index 4955964..cb7c37b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3695,6 +3695,7 @@ WINUSERAPI HDESK WINAPI GetThreadDesktop(DWORD); WINUSERAPI HWND WINAPI GetTopWindow(HWND); WINUSERAPI BOOL WINAPI GetUpdateRect(HWND,LPRECT,BOOL); WINUSERAPI INT WINAPI GetUpdateRgn(HWND,HRGN,BOOL); +WINUSERAPI BOOL WINAPI GetUpdatedClipboardFormats(UINT*,UINT,UINT*); WINUSERAPI BOOL WINAPI GetUserObjectInformationA(HANDLE,INT,LPVOID,DWORD,LPDWORD); WINUSERAPI BOOL WINAPI GetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD,LPDWORD); #define GetUserObjectInformation WINELIB_NAME_AW(GetUserObjectInformation)

1 0

Alexandre Julliard : user32/tests: Add a few more tests for synthesized formats rendering.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: b1e8ed3e3b6efe9f69b41551a62b57d09543dfea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e8ed3e3b6efe9f69b41551a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 15:36:01 2016 +0900 user32/tests: Add a few more tests for synthesized formats rendering. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 79 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index cf6d744..ca81d72 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -561,6 +561,24 @@ static HBITMAP create_dib( BOOL v5 ) return ret; } +static LRESULT CALLBACK renderer_winproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + static UINT rendered; + UINT ret; + + switch (msg) + { + case WM_RENDERFORMAT: + if (wp < 32) rendered |= (1 << wp); + break; + case WM_USER: + ret = rendered; + rendered = 0; + return ret; + } + return DefWindowProcA( hwnd, msg, wp, lp ); +} + static void test_synthesized(void) { static const struct test @@ -583,8 +601,12 @@ static void test_synthesized(void) HGLOBAL h, htext; HENHMETAFILE emf; BOOL r; - UINT cf, i, j, count; + UINT cf, i, j, count, rendered; HANDLE data; + HWND hwnd; + + hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)renderer_winproc ); htext = create_textA(); emf = create_emf(); @@ -653,6 +675,28 @@ static void test_synthesized(void) r = EmptyClipboard(); ok(r, "gle %d\n", GetLastError()); + SetClipboardData( CF_UNICODETEXT, create_textW() ); + SetClipboardData( CF_TEXT, create_textA() ); + SetClipboardData( CF_OEMTEXT, create_textA() ); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + r = OpenClipboard( NULL ); + ok(r, "gle %d\n", GetLastError()); + cf = EnumClipboardFormats(0); + ok( cf == CF_UNICODETEXT, "cf %08x\n", cf ); + cf = EnumClipboardFormats(cf); + ok( cf == CF_TEXT, "cf %08x\n", cf ); + cf = EnumClipboardFormats(cf); + ok( cf == CF_OEMTEXT, "cf %08x\n", cf ); + cf = EnumClipboardFormats(cf); + todo_wine ok( cf == CF_LOCALE, "cf %08x\n", cf ); + if (cf == CF_LOCALE) cf = EnumClipboardFormats( cf ); + ok( cf == 0, "cf %08x\n", cf ); + + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + r = CloseClipboard(); ok(r, "gle %d\n", GetLastError()); @@ -703,7 +747,7 @@ static void test_synthesized(void) todo_wine_if (tests[i].todo) ok( count == j, "%u: count %u instead of %u\n", i, count, j ); - r = OpenClipboard(NULL); + r = OpenClipboard( hwnd ); ok(r, "%u: gle %d\n", i, GetLastError()); cf = 0; for (j = 0; tests[i].expected[j]; j++) @@ -739,13 +783,20 @@ static void test_synthesized(void) r = EmptyClipboard(); ok(r, "%u: gle %d\n", i, GetLastError()); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + SetClipboardData( tests[i].format, 0 ); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); count = CountClipboardFormats(); ok( count == 1, "%u: count %u\n", i, count ); r = CloseClipboard(); ok(r, "%u: gle %d\n", i, GetLastError()); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); count = CountClipboardFormats(); for (j = 0; tests[i].expected[j]; j++) @@ -756,6 +807,8 @@ static void test_synthesized(void) } todo_wine_if (tests[i].todo) ok( count == j, "%u: count %u instead of %u\n", i, count, j ); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); r = OpenClipboard(NULL); ok(r, "%u: gle %d\n", i, GetLastError()); @@ -767,11 +820,28 @@ static void test_synthesized(void) ok(cf == tests[i].expected[j], "%u.%u: got %04x instead of %04x\n", i, j, cf, tests[i].expected[j] ); if (cf != tests[i].expected[j]) break; + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u.%u: formats %08x have been rendered\n", i, j, rendered ); data = GetClipboardData( cf ); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); if (cf == CF_LOCALE) + { ok(data != NULL, "%u: CF_LOCALE no data\n", i); + ok( !rendered, "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + } else + { ok(!data, "%u: format %04x got data %p\n", i, cf, data); + todo_wine_if( tests[i].format == CF_ENHMETAFILE && tests[i].expected[j] == CF_METAFILEPICT ) + ok( rendered == (1 << tests[i].format), + "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + /* try to render a second time */ + data = GetClipboardData( cf ); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + todo_wine_if( i > 2 && j == 1 ) + ok( rendered == (1 << tests[i].format), + "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + } } if (!tests[i].expected[j]) { @@ -780,6 +850,8 @@ static void test_synthesized(void) } r = CloseClipboard(); ok(r, "%u: gle %d\n", i, GetLastError()); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); } r = OpenClipboard(NULL); @@ -788,6 +860,7 @@ static void test_synthesized(void) ok(r, "gle %d\n", GetLastError()); r = CloseClipboard(); ok(r, "gle %d\n", GetLastError()); + DestroyWindow( hwnd ); } static CRITICAL_SECTION clipboard_cs; @@ -1622,6 +1695,8 @@ static void test_handles( HWND hwnd ) ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_UNICODETEXT ); ok( is_fixed( data ), "expected fixed mem %p\n", data ); + data = GetClipboardData( CF_LOCALE ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_BITMAP ); ok( data == bitmap, "expected bitmap %p\n", data ); data = GetClipboardData( CF_PALETTE );

1 0

Alexandre Julliard : user32: Synthesize text clipboard formats on the user32 side.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 8865f4a4ec9f0c8ba001192ecbf509e4e62cd6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8865f4a4ec9f0c8ba001192ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 20:26:09 2016 +0900 user32: Synthesize text clipboard formats on the user32 side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 17 ++-- dlls/user32/clipboard.c | 197 +++++++++++++++++++++++++++++++++++++++--- dlls/user32/tests/clipboard.c | 40 ++++----- 3 files changed, 210 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8865f4a4ec9f0c8ba0011…

1 0

David Keijser : kernel32: Forward CAL_RETURN_GENITIVE_NAMES to GetLocaleInfo().
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 34a0c122cb5b767e17032d1d3e54e42cf1f536fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a0c122cb5b767e17032d1d3… Author: David Keijser <keijser(a)gmail.com> Date: Mon Sep 5 19:46:06 2016 +0300 kernel32: Forward CAL_RETURN_GENITIVE_NAMES to GetLocaleInfo(). Signed-off-by: David Keijser <keijser(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 0a5aa07..f4a1a35 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -916,6 +916,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LOCALE_SMONTHDAY, 0, /* CAL_SABBREVERASTRING */ }; + DWORD localeflags = 0; CALTYPE calinfo; if (CalType & CAL_NOUSEROVERRIDE) @@ -943,6 +944,9 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, calinfo = CalType & 0xffff; + if (CalType & CAL_RETURN_GENITIVE_NAMES) + localeflags |= LOCALE_RETURN_GENITIVE_NAMES; + switch (calinfo) { case CAL_ICALINTVALUE: if (CalType & CAL_RETURN_NUMBER) @@ -1002,7 +1006,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: case CAL_SYEARMONTH: - return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo], lpCalData, cchData); + return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) {

1 0