February 2017 - Wine-commits

Hans Leidekker : wbemprox: Don't define USE_WS_PREFIX on MinGW.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: d11a07ec7c4247ea8c3de78cc09aee8f2c7d7298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11a07ec7c4247ea8c3de78cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 1 14:18:49 2017 +0100 wbemprox: Don't define USE_WS_PREFIX on MinGW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 - dlls/wbemprox/builtin.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index e6dc995..f411898 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DUSE_WS_PREFIX MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 14e819e..0976306 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -31,8 +31,17 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "winsock2.h" -#include "ws2tcpip.h" +#ifdef __MINGW32__ +# include "winsock2.h" +# include "ws2tcpip.h" +# define WS_AF_UNSPEC AF_UNSPEC +# define WS_NI_MAXHOST NI_MAXHOST +# define WS_NI_NAMEREQD NI_NAMEREQD +#else +# define USE_WS_PREFIX +# include "winsock2.h" +# include "ws2tcpip.h" +#endif #include "initguid.h" #include "wbemcli.h" #include "wbemprov.h"

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_IP4RouteTable.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 92168c4e4170f06ffded132215c957edd27513d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92168c4e4170f06ffded13221… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 1 14:18:50 2017 +0100 wbemprox: Add a partial implementation of Win32_IP4RouteTable. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 63 +++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 0976306..73d93a0 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -26,6 +26,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -81,6 +84,8 @@ static const WCHAR class_diskdriveW[] = {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e',0}; static const WCHAR class_diskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; +static const WCHAR class_ip4routetableW[] = + {'W','i','n','3','2','_','I','P','4','R','o','u','t','e','T','a','b','l','e',0}; static const WCHAR class_logicaldiskW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_logicaldisk2W[] = @@ -184,6 +189,8 @@ static const WCHAR prop_defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR prop_destinationW[] = + {'D','e','s','t','i','n','a','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; static const WCHAR prop_dhcpenabledW[] = @@ -272,6 +279,8 @@ static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; static const WCHAR prop_networkW[] = {'N','e','t','w','o','r','k',0}; +static const WCHAR prop_nexthopW[] = + {'N','e','x','t','H','o','p',0}; static const WCHAR prop_numcoresW[] = {'N','u','m','b','e','r','O','f','C','o','r','e','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = @@ -471,6 +480,12 @@ static const struct column col_diskpartition[] = { prop_startingoffsetW, CIM_UINT64 }, { prop_typeW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_ip4routetable[] = +{ + { prop_destinationW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_interfaceindexW, CIM_SINT32|COL_FLAG_KEY }, + { prop_nexthopW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, +}; static const struct column col_logicaldisk[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -855,6 +870,12 @@ struct record_diskpartition UINT64 startingoffset; const WCHAR *type; }; +struct record_ip4routetable +{ + const WCHAR *destination; + INT32 interfaceindex; + const WCHAR *nexthop; +}; struct record_logicaldisk { const WCHAR *device_id; @@ -2025,6 +2046,59 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex return status; } +static WCHAR *get_ip4_string( DWORD addr ) +{ + static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + WCHAR *ret; + + if (!(ret = heap_alloc( sizeof("ddd.ddd.ddd.ddd") * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff ); + return ret; +} + +static enum fill_status fill_ip4routetable( struct table *table, const struct expr *cond ) +{ + struct record_ip4routetable *rec; + UINT i, row = 0, offset = 0, size = 0; + MIB_IPFORWARDTABLE *forwards; + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (GetIpForwardTable( NULL, &size, TRUE ) != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; + if (!(forwards = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (GetIpForwardTable( forwards, &size, TRUE )) + { + heap_free( forwards ); + return FILL_STATUS_FAILED; + } + if (!resize_table( table, forwards->dwNumEntries, sizeof(*rec) )) + { + heap_free( forwards ); + return FILL_STATUS_FAILED; + } + + for (i = 0; i < forwards->dwNumEntries; i++) + { + rec = (struct record_ip4routetable *)(table->data + offset); + + rec->destination = get_ip4_string( ntohl(forwards->table[i].dwForwardDest) ); + rec->interfaceindex = forwards->table[i].dwForwardIfIndex; + rec->nexthop = get_ip4_string( ntohl(forwards->table[i].dwForwardNextHop) ); + + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + TRACE("created %u rows\n", row); + table->num_rows = row; + + heap_free( forwards ); + return status; +} + static WCHAR *get_volumename( const WCHAR *root ) { WCHAR buf[MAX_PATH + 1] = {0}; @@ -3171,6 +3245,7 @@ static struct table builtin_classes[] = { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition }, + { class_ip4routetableW, SIZEOF(col_ip4routetable), col_ip4routetable, 0, 0, NULL, fill_ip4routetable }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1aeb7e5..8ff9803 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1301,6 +1301,68 @@ static void test_PhysicalMemory( IWbemServices *services ) SysFreeString( wql ); } +static void test_IP4RouteTable( IWbemServices *services ) +{ + static const WCHAR destinationW[] = {'D','e','s','t','i','n','a','t','i','o','n',0}; + static const WCHAR interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; + static const WCHAR nexthopW[] = {'N','e','x','t','H','o','p',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'I','P','4','R','o','u','t','e','T','a','b','l','e',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_IP4RouteTable not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, destinationW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get destination %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "destination %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, interfaceindexW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get interface index %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_SINT32, "unexpected type 0x%x\n", type ); + trace( "interfaceindex %d\n", V_I4( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, nexthopW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get nexthop %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "nexthop %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + } + + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1341,6 +1403,7 @@ START_TEST(query) test_OperatingSystem( services ); test_ComputerSystemProduct( services ); test_PhysicalMemory( services ); + test_IP4RouteTable( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Hugh McMaster : regedit: Remove unnecessary error handling from message box functions in edit.c.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 6350cfd8c7aa70b7168adc569d0184231cfbf9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6350cfd8c7aa70b7168adc569… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 1 12:56:15 2017 +0000 regedit: Remove unnecessary error handling from message box functions in edit.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index e211ff8..a223535 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -48,15 +48,12 @@ struct edit_params static INT vmessagebox(HWND hwnd, INT buttons, INT titleId, INT resId, va_list ap) { - static const WCHAR errorW[] = {'E','r','r','o','r',0}; - static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',' ','e','r','r','o','r',' ','s','t','r','i','n','g','!',0}; - WCHAR title[256]; WCHAR errfmt[1024]; WCHAR errstr[1024]; - if (!LoadStringW(hInst, titleId, title, COUNT_OF(title))) lstrcpyW(title, errorW); - if (!LoadStringW(hInst, resId, errfmt, COUNT_OF(errfmt))) lstrcpyW(errfmt, unknownW); + LoadStringW(hInst, titleId, title, COUNT_OF(title)); + LoadStringW(hInst, resId, errfmt, COUNT_OF(errfmt)); vsnprintfW(errstr, COUNT_OF(errstr), errfmt, ap); @@ -87,20 +84,14 @@ void error(HWND hwnd, INT resId, ...) static void error_code_messagebox(HWND hwnd, DWORD error_code) { LPWSTR lpMsgBuf; - DWORD status; WCHAR title[256]; - static WCHAR fallback[] = {'E','r','r','o','r',' ','d','i','s','p','l','a','y','i','n','g',' ','e','r','r','o','r',' ','m','e','s','s','a','g','e','.','\n',0}; - static const WCHAR title_error[] = {'E','r','r','o','r',0}; - - if (!LoadStringW(hInst, IDS_ERROR, title, COUNT_OF(title))) - lstrcpyW(title, title_error); - status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, NULL); - if (!status) - lpMsgBuf = fallback; + + LoadStringW(hInst, IDS_ERROR, title, COUNT_OF(title)); + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, NULL); + MessageBoxW(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); - if (lpMsgBuf != fallback) - LocalFree(lpMsgBuf); + LocalFree(lpMsgBuf); } static BOOL change_dword_base(HWND hwndDlg, BOOL toHex)

1 0

Nikolay Sivov : dwrite/tests: Use shaping properties structure in tests data.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: b9230452ef95996f26be32b63248f33cede276ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9230452ef95996f26be32b63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 07:54:40 2017 +0300 dwrite/tests: Use shaping properties structure in tests data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 7e916f7..3263d0b 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1710,7 +1710,7 @@ struct spacing_test { FLOAT modified_advances[3]; FLOAT modified_offsets[3]; BOOL single_cluster; - BOOL is_ZWS[3]; + DWRITE_SHAPING_GLYPH_PROPERTIES props[3]; }; static const struct spacing_test spacing_tests[] = { @@ -1745,20 +1745,20 @@ static const struct spacing_test spacing_tests[] = { { 1.0, -10.0, 5.0, { 2.0, 1.0, 10.0 }, { 2.0, 3.0, 4.0 }, { 3.0, 1.0, 2.0 }, { 3.0, 3.0, 4.0 }, TRUE }, { -10.0, -10.0, 5.0, { 11.0, 1.0, 11.0 }, { 2.0, 3.0, 4.0 }, { 2.0, 1.0, 2.0 }, { -7.0, 3.0, 4.0 }, TRUE }, /* isZeroWidthSpace set */ - { 1.0, 0.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 12.0 }, { 2.0, 4.0 }, FALSE, { TRUE, FALSE } }, - { 1.0, 1.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 13.0 }, { 2.0, 4.0 }, FALSE, { TRUE, FALSE } }, /* 30 */ - { 1.0, -1.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 3.0, 3.0 }, FALSE, { FALSE, TRUE } }, - { 0.0, -10.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 1.0 }, { 2.0, 3.0 }, FALSE, { TRUE, FALSE } }, - { -5.0, -4.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 11.0 }, { -1.0, 3.0 }, FALSE, { FALSE, TRUE } }, - { -5.0, -5.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 2.0, 3.0 }, FALSE, { TRUE, TRUE } }, - { 2.0, 0.0, 5.0, { 1.0, 2.0 }, { 2.0, 3.0 }, { 7.0, 2.0 }, { 6.0, 3.0 }, FALSE, { FALSE, TRUE } }, /* 35 */ - { 2.0, 1.0, 5.0, { 1.0, 2.0 }, { 2.0, 3.0 }, { 8.0, 2.0 }, { 6.0, 3.0 }, FALSE, { FALSE, TRUE } }, - { 2.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 2.0, 3.0 }, FALSE, { TRUE, TRUE } }, - { 1.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 11.0 }, { 3.0, 3.0 }, FALSE, { FALSE, TRUE } }, - { -10.0, 1.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 2.0, 3.0 }, FALSE, { TRUE, TRUE } }, - { 0.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 11.0 }, { 2.0, 3.0 }, FALSE, { FALSE, TRUE } }, /* 40 */ - { 1.0, -10.0, -5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 0.0, 0.0 }, { 2.0, 3.0 }, FALSE, { TRUE, FALSE } }, - { -10.0, 1.0, 5.0, { 8.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 11.0 }, { -1.0, 3.0 }, FALSE, { FALSE, TRUE } }, + { 1.0, 0.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 12.0 }, { 2.0, 4.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0 } } }, + { 1.0, 1.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 13.0 }, { 2.0, 4.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0 } } }, /* 30 */ + { 1.0, -1.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 3.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, + { 0.0, -10.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 1.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0 } } }, + { -5.0, -4.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 11.0 }, { -1.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, + { -5.0, -5.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0, 0, 0, 1, 0 }} }, + { 2.0, 0.0, 5.0, { 1.0, 2.0 }, { 2.0, 3.0 }, { 7.0, 2.0 }, { 6.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, /* 35 */ + { 2.0, 1.0, 5.0, { 1.0, 2.0 }, { 2.0, 3.0 }, { 8.0, 2.0 }, { 6.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, + { 2.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0, 0, 0, 1, 0 } } }, + { 1.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 11.0 }, { 3.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, + { -10.0, 1.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0, 0, 0, 1, 0 } } }, + { 0.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 11.0 }, { 2.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, /* 40 */ + { 1.0, -10.0, -5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 0.0, 0.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0 } } }, + { -10.0, 1.0, 5.0, { 8.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 11.0 }, { -1.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, }; static void test_ApplyCharacterSpacing(void) @@ -1807,10 +1807,7 @@ static void test_ApplyCharacterSpacing(void) } advances[0] = advances[1] = 123.45; - memset(props, 0, sizeof(props)); - props[0].isZeroWidthSpace = ptr->is_ZWS[0]; - props[1].isZeroWidthSpace = ptr->is_ZWS[1]; - props[2].isZeroWidthSpace = ptr->is_ZWS[2]; + memcpy(props, ptr->props, sizeof(props)); hr = IDWriteTextAnalyzer1_ApplyCharacterSpacing(analyzer1, ptr->leading,

1 0

Nikolay Sivov : dwrite/tests: More spacing tests with isDiacritic.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 9350e57322e7228c7133d097db69e8ea251e47bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9350e57322e7228c7133d097d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 07:54:41 2017 +0300 dwrite/tests: More spacing tests with isDiacritic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 3263d0b..a0dbb186 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1759,6 +1759,21 @@ static const struct spacing_test spacing_tests[] = { { 0.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 11.0 }, { 2.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, /* 40 */ { 1.0, -10.0, -5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 0.0, 0.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0 } } }, { -10.0, 1.0, 5.0, { 8.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 11.0 }, { -1.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, + /* isDiacritic */ + { 1.0, 0.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 11.0, 12.0 }, { 3.0, 4.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0 } } }, + { 1.0, 1.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 12.0, 13.0 }, { 3.0, 4.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0 } } }, + { 1.0, -1.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 3.0, 4.0 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, /* 45 */ + { 0.0, -10.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 0.0, 1.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0 } } }, + { -5.0, -4.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 5.0 }, { -1.0, -0.5 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, + { -5.0, -5.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 5.0 }, { -0.5, 0.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0, 0, 1, 0, 0 }} }, + { 2.0, 0.0, 5.0, { 1.0, 2.0 }, { 2.0, 3.0 }, { 7.0, 7.0 }, { 6.0, 6.5 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, + { 2.0, 1.0, 5.0, { 1.0, 2.0 }, { 2.0, 3.0 }, { 8.0, 8.0 }, { 6.0, 6.5 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, /* 50 */ + { 2.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 7.0, 7.0 }, { 4.0, 5.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0, 0, 1, 0, 0 } } }, + { 1.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 11.0 }, { 3.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, + { -10.0, 1.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 6.0 }, { -3.0, -3.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0, 0, 1, 0, 0 } } }, + { 0.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 5.0 }, { 2.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, + { 1.0, -10.0, -5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 0.0, 0.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0 } } }, /* 55 */ + { -10.0, 1.0, 5.0, { 8.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 6.0 }, { -1.0, -3.0 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, }; static void test_ApplyCharacterSpacing(void)

1 0

Nikolay Sivov : dwrite/tests: Line metrics tests with uniform spacing.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: eb7edb249b80781e738fc805f8a317f32a381dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7edb249b80781e738fc805f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 07:54:42 2017 +0300 dwrite/tests: Line metrics tests with uniform spacing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 15274b9..741fc3e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3624,6 +3624,21 @@ static void test_GetLineMetrics(void) ok(metrics[3].height == metrics[1].height, "got %f, old %f\n", metrics[3].height, metrics[1].height); ok(metrics[3].baseline == metrics[1].baseline, "got %f, old %f\n", metrics[3].baseline, metrics[1].baseline); + /* Switch to uniform spacing */ + hr = IDWriteTextLayout_SetLineSpacing(layout, DWRITE_LINE_SPACING_METHOD_UNIFORM, 456.0f, 123.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 2, "got %u\n", count); + + for (i = 0; i < count; i++) { + todo_wine { + ok(metrics[i].height == 456.0f, "%u: got line height %f\n", i, metrics[i].height); + ok(metrics[i].baseline == 123.0f, "%u: got line baseline %f\n", i, metrics[i].baseline); + } + } + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Nikolay Sivov : kernel32/nls: Added Nepali locale data.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 452c1ef66df73e178a26d317a99bea15aea72d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=452c1ef66df73e178a26d317a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 07:59:30 2017 +0300 kernel32/nls: Added Nepali locale data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/nep.nls | 162 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 363e7ab..cddac46 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -232,6 +232,8 @@ #include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ +#include "nls/nep.nls" /* 0x0461 LANG_NEPALI, SUBLANG_NEPALI_NEPAL */ + #include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ #include "nls/brf.nls" /* 0x047e LANG_BRETON, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/nep.nls b/dlls/kernel32/nls/nep.nls new file mode 100644 index 0000000..3b13f8a --- /dev/null +++ b/dlls/kernel32/nls/nep.nls @@ -0,0 +1,162 @@ +/* + * Locale definitions for Nepali + * + * Copyright 2017 Nikolay Sivov 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 + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_NEPALI, SUBLANG_NEPALI_NEPAL +{ + LOCALE_FONTSIGNATURE L"\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x8000\x0000\x0000\x0000\x0000\x0000\x0000\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "977" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "0" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "977" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0461" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0461" + LOCALE_ILDATE "0" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGCURR "9" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "0" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "पूर्वाह्न" + LOCALE_S2359 "अपराह्न" + LOCALE_SABBREVCTRYNAME "NPL" + LOCALE_SABBREVDAYNAME1 "सोम" + LOCALE_SABBREVDAYNAME2 "मङ्गल" + LOCALE_SABBREVDAYNAME3 "बुध" + LOCALE_SABBREVDAYNAME4 "बिही" + LOCALE_SABBREVDAYNAME5 "शुक्र" + LOCALE_SABBREVDAYNAME6 "शनि" + LOCALE_SABBREVDAYNAME7 "आइत" + LOCALE_SABBREVLANGNAME "NEP" + LOCALE_SABBREVMONTHNAME1 "जन" + LOCALE_SABBREVMONTHNAME2 "फेब" + LOCALE_SABBREVMONTHNAME3 "मार्च" + LOCALE_SABBREVMONTHNAME4 "अप्रिल" + LOCALE_SABBREVMONTHNAME5 "मे" + LOCALE_SABBREVMONTHNAME6 "जून" + LOCALE_SABBREVMONTHNAME7 "जुलाई" + LOCALE_SABBREVMONTHNAME8 "अग" + LOCALE_SABBREVMONTHNAME9 "सेप्ट" + LOCALE_SABBREVMONTHNAME10 "अक्ट" + LOCALE_SABBREVMONTHNAME11 "नोभ" + LOCALE_SABBREVMONTHNAME12 "डिस" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Nepal" + LOCALE_SCURRENCY "रु" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "सोमवार" + LOCALE_SDAYNAME2 "मङ्गलवार" + LOCALE_SDAYNAME3 "बुधवार" + LOCALE_SDAYNAME4 "बिहीवार" + LOCALE_SDAYNAME5 "शुक्रवार" + LOCALE_SDAYNAME6 "शनिवार" + LOCALE_SDAYNAME7 "आइतवार" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Nepal" + LOCALE_SENGCURRNAME "Nepalese Rupee" + LOCALE_SENGLANGUAGE "Nepali" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "NPR" + LOCALE_SISO3166CTRYNAME "NP" + LOCALE_SISO639LANGNAME "ne" + LOCALE_SLANGUAGE "Nepali (Nepal)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dddd, MMMM dd, yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "जनवरी" + LOCALE_SMONTHNAME2 "फेब्रुअरी" + LOCALE_SMONTHNAME3 "मार्च" + LOCALE_SMONTHNAME4 "अप्रिल" + LOCALE_SMONTHNAME5 "मे" + LOCALE_SMONTHNAME6 "जून" + LOCALE_SMONTHNAME7 "जुलाई" + LOCALE_SMONTHNAME8 "अगस्त" + LOCALE_SMONTHNAME9 "सेप्टेम्बर" + LOCALE_SMONTHNAME10 "अक्टोबर" + LOCALE_SMONTHNAME11 "नोभेम्बर" + LOCALE_SMONTHNAME12 "डिसेम्बर" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "ne-NP" + LOCALE_SNATIVECTRYNAME "नेपाल" + LOCALE_SNATIVECURRNAME "रुपैयाँ" + LOCALE_SNATIVEDIGITS "०१२३४५६७८९" + LOCALE_SNATIVEDISPLAYNAME "नेपाली (नेपाल)" + LOCALE_SNATIVELANGNAME "नेपाली" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "NEP " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Deva;" + LOCALE_SSHORTDATE "M/d/yyyy" + LOCALE_SSHORTESTDAYNAME1 "सो" + LOCALE_SSHORTESTDAYNAME2 "म" + LOCALE_SSHORTESTDAYNAME3 "बु" + LOCALE_SSHORTESTDAYNAME4 "बि" + LOCALE_SSHORTESTDAYNAME5 "शु" + LOCALE_SSHORTESTDAYNAME6 "श" + LOCALE_SSHORTESTDAYNAME7 "आ" + LOCALE_SSHORTTIME "h:mm tt" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "h:mm:ss tt" + LOCALE_SYEARMONTH "MMMM,yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

Nikolay Sivov : comctl32/propsheet: Force wizard header if any of pages has title/subtitle.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 6eafebedb88ccd00aac6b838fd9d882c94ae61b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eafebedb88ccd00aac6b838f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 08:17:03 2017 +0300 comctl32/propsheet: Force wizard header if any of pages has title/subtitle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 1809b86..4c04dfe 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -486,6 +486,9 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, width = (WORD)*p; p++; height = (WORD)*p; p++; + if (lppsp->dwFlags & (PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE)) + psInfo->ppshheader.dwFlags |= PSH_HEADER; + /* Special calculation for interior wizard pages so the largest page is * calculated correctly. We need to add all the padding and space occupied * by the header so the width and height sums up to the whole wizard client

1 0

Nikolay Sivov : comctl32/propsheet: Only use header bitmap when asked for it.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 34dd326060e7458661aa0644e3aa81503cc5097d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34dd326060e7458661aa0644e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 08:17:04 2017 +0300 comctl32/propsheet: Only use header bitmap when asked for it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 115 ++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4c04dfe..f575e16 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3205,61 +3205,65 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) COLORREF clrOld = 0; int oldBkMode = 0; - hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); - hOldFont = SelectObject(hdc, psInfo->hFontBold); - - GetClientRect(hwndLineHeader, &r); - MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2); - SetRect(&rzone, 0, 0, r.right + 1, r.top - 1); - - GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm); - - if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD) - { - /* Fill the unoccupied part of the header with color of the - * left-top pixel, but do it only when needed. - */ - if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) - { - hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); - r = rzone; - if (bm.bmWidth < r.right) - { - r.left = bm.bmWidth; - FillRect(hdc, &r, hbr); - } - if (bm.bmHeight < r.bottom) - { - r.left = 0; - r.top = bm.bmHeight; - FillRect(hdc, &r, hbr); - } - DeleteObject(hbr); - } - - /* Draw the header itself. */ - BitBlt(hdc, 0, 0, - bm.bmWidth, min(bm.bmHeight, rzone.bottom), - hdcSrc, 0, 0, SRCCOPY); - } - else - { - int margin; - hbr = GetSysColorBrush(COLOR_WINDOW); - FillRect(hdc, &rzone, hbr); - - /* Draw the header bitmap. It's always centered like a - * common 49 x 49 bitmap. */ - margin = (rzone.bottom - 49) / 2; - BitBlt(hdc, rzone.right - 49 - margin, margin, - min(bm.bmWidth, 49), min(bm.bmHeight, 49), - hdcSrc, 0, 0, SRCCOPY); - - /* NOTE: Native COMCTL32 draws a white stripe over the bitmap - * if its height is smaller than 49 pixels. Because the reason - * for this bug is unknown the current code doesn't try to - * replicate it. */ - } + GetClientRect(hwndLineHeader, &r); + MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2); + SetRect(&rzone, 0, 0, r.right + 1, r.top - 1); + + hOldFont = SelectObject(hdc, psInfo->hFontBold); + + if (psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER) + { + hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); + + GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm); + if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD) + { + /* Fill the unoccupied part of the header with color of the + * left-top pixel, but do it only when needed. + */ + if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) + { + hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); + r = rzone; + if (bm.bmWidth < r.right) + { + r.left = bm.bmWidth; + FillRect(hdc, &r, hbr); + } + if (bm.bmHeight < r.bottom) + { + r.left = 0; + r.top = bm.bmHeight; + FillRect(hdc, &r, hbr); + } + DeleteObject(hbr); + } + + /* Draw the header itself. */ + BitBlt(hdc, 0, 0, bm.bmWidth, min(bm.bmHeight, rzone.bottom), + hdcSrc, 0, 0, SRCCOPY); + } + else + { + int margin; + hbr = GetSysColorBrush(COLOR_WINDOW); + FillRect(hdc, &rzone, hbr); + + /* Draw the header bitmap. It's always centered like a + * common 49 x 49 bitmap. */ + margin = (rzone.bottom - 49) / 2; + BitBlt(hdc, rzone.right - 49 - margin, margin, + min(bm.bmWidth, 49), min(bm.bmHeight, 49), + hdcSrc, 0, 0, SRCCOPY); + + /* NOTE: Native COMCTL32 draws a white stripe over the bitmap + * if its height is smaller than 49 pixels. Because the reason + * for this bug is unknown the current code doesn't try to + * replicate it. */ + } + + SelectObject(hdcSrc, hbmp); + } clrOld = SetTextColor (hdc, 0x00000000); oldBkMode = SetBkMode (hdc, TRANSPARENT); @@ -3300,7 +3304,6 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) SetTextColor(hdc, clrOld); SetBkMode(hdc, oldBkMode); SelectObject(hdc, hOldFont); - SelectObject(hdcSrc, hbmp); } if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) &&

1 0

Michael Stefaniuc : msvcrt/tests: Use NULL instead of casting 0.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 6fadcca527f8d4a9766ebc759d2e43fe16e97141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fadcca527f8d4a9766ebc759… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 1 10:47:20 2017 +0100 msvcrt/tests: Use NULL instead of casting 0. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index a6d2833..017ae77 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -562,7 +562,7 @@ static void test_thread_handle_close(void) DWORD ret; /* _beginthread: handle is not closed on ExitThread and _endthreadex */ - hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)0); + hThread = (HANDLE)_beginthread(test_thread_func, 0, NULL); ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); WaitForSingleObject(hThread, INFINITE); ret = CloseHandle(hThread);

1 0