wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Huw Davies : user32: Hardcode the GetWindowLong values for the desktop window to avoid a server round-trip.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: e883d0ec606116ec2ce43ac4a95d0b5a7fe35a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e883d0ec606116ec2ce43ac4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 2 12:00:01 2017 +0000 user32: Hardcode the GetWindowLong values for the desktop window to avoid a server round-trip. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/win.c | 24 +++++++++++++++- 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f926b9d..992bffb 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7143,6 +7143,25 @@ static void test_hwnd_message(void) HWND parent = 0, hwnd, found; RECT rect; + static const struct + { + int offset; + ULONG_PTR expect; + DWORD error; + } + tests[] = + { + { GWLP_USERDATA, 0, 0 }, + { GWL_STYLE, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0 }, + { GWL_EXSTYLE, 0, 0 }, + { GWLP_ID, 0, 0 }, + /* GWLP_HWNDPARENT - returns random values */ + /* GWLP_HINSTANCE - not useful and not consistent between Windows versions */ + { GWLP_WNDPROC, 0, ERROR_ACCESS_DENIED }, + { DWLP_MSGRESULT, 0, ERROR_INVALID_INDEX } + }; + DWORD_PTR result; + int i; /* HWND_MESSAGE is not supported below w2k, but win9x return != 0 on CreateWindowExA and crash later in the test. @@ -7166,7 +7185,7 @@ static void test_hwnd_message(void) ok(parent != desktop, "GetAncestor(GA_PARENT) should not return desktop for message windows\n"); root = pGetAncestor(hwnd, GA_ROOT); ok(root == hwnd, "GetAncestor(GA_ROOT) should return hwnd for message windows\n"); - ok( !pGetAncestor(parent, GA_PARENT) || broken(pGetAncestor(parent, GA_PARENT) != 0), /* win2k */ + ok( !pGetAncestor(parent, GA_PARENT), "parent shouldn't have parent %p\n", pGetAncestor(parent, GA_PARENT) ); trace("parent %p root %p desktop %p\n", parent, root, desktop); if (!GetClassNameA( parent, buffer, sizeof(buffer) )) buffer[0] = 0; @@ -7202,6 +7221,21 @@ static void test_hwnd_message(void) ok( !IsWindowVisible( hwnd ), "HWND_MESSAGE window is visible\n" ); if (parent) ok( !IsWindowVisible( parent ), "HWND_MESSAGE parent is visible\n" ); + /* GetWindowLong */ + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + SetLastError( 0xdeadbeef ); + result = GetWindowLongPtrW( parent, tests[i].offset ); + ok( result == tests[i].expect, "offset %d, got %08lx expect %08lx\n", + tests[i].offset, result, tests[i].expect ); + if (tests[i].error) + ok( GetLastError() == tests[i].error, "offset %d: error %d expect %d\n", + tests[i].offset, GetLastError(), tests[i].error ); + else + ok( GetLastError() == 0xdeadbeef, "offset %d: error %d expect unchanged\n", + tests[i].offset, GetLastError() ); + } + DestroyWindow(hwnd); } @@ -9567,6 +9601,45 @@ static void test_LockWindowUpdate(HWND parent) DestroyWindow(child); } +static void test_desktop( void ) +{ + HWND desktop = GetDesktopWindow(); + /* GetWindowLong Desktop window tests */ + static const struct + { + int offset; + ULONG_PTR expect; + DWORD error; + } + tests[] = + { + { GWLP_USERDATA, 0, 0 }, + { GWL_STYLE, WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0 }, + { GWL_EXSTYLE, 0, 0 }, + { GWLP_ID, 0, 0 }, + { GWLP_HWNDPARENT, 0, 0 }, + /* GWLP_HINSTANCE - not useful and not consistent between Windows versions */ + { GWLP_WNDPROC, 0, ERROR_ACCESS_DENIED }, + { DWLP_MSGRESULT, 0, ERROR_INVALID_INDEX } + }; + DWORD_PTR result; + int i; + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + SetLastError( 0xdeadbeef ); + result = GetWindowLongPtrW( desktop, tests[i].offset ); + ok( result == tests[i].expect, "offset %d, got %08lx expect %08lx\n", + tests[i].offset, result, tests[i].expect ); + if (tests[i].error) + ok( GetLastError() == tests[i].error, "offset %d: error %d expect %d\n", + tests[i].offset, GetLastError(), tests[i].error ); + else + ok( GetLastError() == 0xdeadbeef, "offset %d: error %d expect unchanged\n", + tests[i].offset, GetLastError() ); + } +} + START_TEST(win) { char **argv; @@ -9714,6 +9787,7 @@ START_TEST(win) test_winproc_handles(argv[0]); test_deferwindowpos(); test_LockWindowUpdate(hwndMain); + test_desktop(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a7be4a3..4406577 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2242,7 +2242,29 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod return 0; } - if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) + if (wndPtr == WND_DESKTOP) + { + switch (offset) + { + case GWL_STYLE: + retvalue = WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; /* message parent is not visible */ + if (WIN_GetFullHandle( hwnd ) == GetDesktopWindow()) + retvalue |= WS_VISIBLE; + return retvalue; + case GWL_EXSTYLE: + case GWLP_USERDATA: + case GWLP_ID: + case GWLP_HINSTANCE: + return 0; + case GWLP_WNDPROC: + SetLastError( ERROR_ACCESS_DENIED ); + return 0; + } + SetLastError( ERROR_INVALID_INDEX ); + return 0; + } + + if (wndPtr == WND_OTHER_PROCESS) { if (offset == GWLP_WNDPROC) {

1 0

André Hentschel : iphlpapi: Use the new version of the IP_ADAPTER_UNICAST_ADDRESS structure.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 1bb9db43e1e07bc124975d659a102c0c2d7917ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb9db43e1e07bc124975d659… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 1 22:58:56 2017 +0100 iphlpapi: Use the new version of the IP_ADAPTER_UNICAST_ADDRESS structure. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 46 ++++++++++++++++++++++++++---------------- dlls/iphlpapi/tests/iphlpapi.c | 10 +++++++++ 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 54f7a37..1daf54d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -868,6 +868,27 @@ static ULONG count_v4_gateways(DWORD index, PMIB_IPFORWARDTABLE routeTable) return num_gateways; } +static DWORD mask_v4_to_prefix(DWORD m) +{ +#ifdef HAVE___BUILTIN_POPCOUNT + return __builtin_popcount(m); +#else + m -= m >> 1 & 0x55555555; + m = (m & 0x33333333) + (m >> 2 & 0x33333333); + return ((m + (m >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; +#endif +} + +static DWORD mask_v6_to_prefix(SOCKET_ADDRESS *m) +{ + const IN6_ADDR *mask = &((struct WS_sockaddr_in6 *)m->lpSockaddr)->sin6_addr; + DWORD ret = 0, i; + + for (i = 0; i < 8; i++) + ret += mask_v4_to_prefix(mask->u.Word[i]); + return ret; +} + static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, PMIB_IPFORWARDTABLE routeTable) { @@ -1065,6 +1086,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf)); fill_unicast_addr_data(aa, ua); + ua->OnLinkPrefixLength = mask_v4_to_prefix(v4masks[i]); + ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1) { @@ -1103,6 +1126,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index debugstr_ipv6(sa, addr_buf)); fill_unicast_addr_data(aa, ua); + ua->OnLinkPrefixLength = mask_v6_to_prefix(&v6masks[i]); + ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v6addrs - 1) { @@ -1132,12 +1157,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index sa->sin_addr.S_un.S_addr = v4addrs[i] & v4masks[i]; sa->sin_port = 0; - prefix->PrefixLength = 0; - for (j = 0; j < sizeof(*v4masks) * 8; j++) - { - if (v4masks[i] & 1 << j) prefix->PrefixLength++; - else break; - } + prefix->PrefixLength = mask_v4_to_prefix(v4masks[i]); + TRACE("IPv4 network: %s/%u\n", debugstr_ipv4((const in_addr_t *)&sa->sin_addr.S_un.S_addr, addr_buf), prefix->PrefixLength); @@ -1168,8 +1189,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index char addr_buf[46]; struct WS_sockaddr_in6 *sa; const IN6_ADDR *addr, *mask; - BOOL done = FALSE; - ULONG k; prefix->u.s.Length = sizeof(*prefix); prefix->u.s.Flags = 0; @@ -1186,15 +1205,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index for (j = 0; j < 8; j++) sa->sin6_addr.u.Word[j] = addr->u.Word[j] & mask->u.Word[j]; sa->sin6_scope_id = 0; - prefix->PrefixLength = 0; - for (k = 0; k < 8 && !done; k++) - { - for (j = 0; j < sizeof(WORD) * 8 && !done; j++) - { - if (mask->u.Word[k] & 1 << j) prefix->PrefixLength++; - else done = TRUE; - } - } + prefix->PrefixLength = mask_v6_to_prefix(&v6masks[i]); + TRACE("IPv6 network: %s/%u\n", debugstr_ipv6(sa, addr_buf), prefix->PrefixLength); ptr += prefix->u.s.Length + prefix->Address.iSockaddrLength; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 64d03cf..e4a5864 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1409,6 +1409,9 @@ static void test_GetAdaptersAddresses(void) ua = aa->FirstUnicastAddress; while (ua) { + ok(S(U(*ua)).Length == sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH) || + S(U(*ua)).Length == sizeof(IP_ADAPTER_UNICAST_ADDRESS_XP), + "Unknown structure size of %u bytes\n", S(U(*ua)).Length); ok(ua->PrefixOrigin != IpPrefixOriginOther, "bad address config value %d\n", ua->PrefixOrigin); ok(ua->SuffixOrigin != IpSuffixOriginOther, @@ -1435,6 +1438,13 @@ static void test_GetAdaptersAddresses(void) trace("\tValidLifetime: %u seconds\n", ua->ValidLifetime); trace("\tPreferredLifetime: %u seconds\n", ua->PreferredLifetime); trace("\tLeaseLifetime: %u seconds\n", ua->LeaseLifetime); + if (S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH)) + { + trace("\n"); + ua = ua->Next; + continue; + } + trace("\tOnLinkPrefixLength: %u\n", ua->OnLinkPrefixLength); trace("\n"); ua = ua->Next; }

1 0

André Hentschel : include: Add the new version of the IP_ADAPTER_UNICAST_ADDRESS structure.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: f3eaa681652ce8f7c8e4b5f085aa3bf5d68ff825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3eaa681652ce8f7c8e4b5f08… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 1 22:58:53 2017 +0100 include: Add the new version of the IP_ADAPTER_UNICAST_ADDRESS structure. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iptypes.h | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index cda879d..e4fa90c 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -94,22 +94,43 @@ typedef NL_DAD_STATE IP_DAD_STATE; #ifdef _WINSOCK2API_ -typedef struct _IP_ADAPTER_UNICAST_ADDRESS { +typedef struct _IP_ADAPTER_UNICAST_ADDRESS_LH { union { struct { ULONG Length; DWORD Flags; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - struct _IP_ADAPTER_UNICAST_ADDRESS *Next; - SOCKET_ADDRESS Address; - IP_PREFIX_ORIGIN PrefixOrigin; - IP_SUFFIX_ORIGIN SuffixOrigin; - IP_DAD_STATE DadState; - ULONG ValidLifetime; - ULONG PreferredLifetime; - ULONG LeaseLifetime; -} IP_ADAPTER_UNICAST_ADDRESS, *PIP_ADAPTER_UNICAST_ADDRESS; + struct _IP_ADAPTER_UNICAST_ADDRESS_LH *Next; + SOCKET_ADDRESS Address; + IP_PREFIX_ORIGIN PrefixOrigin; + IP_SUFFIX_ORIGIN SuffixOrigin; + IP_DAD_STATE DadState; + ULONG ValidLifetime; + ULONG PreferredLifetime; + ULONG LeaseLifetime; + UINT8 OnLinkPrefixLength; +} IP_ADAPTER_UNICAST_ADDRESS_LH, *PIP_ADAPTER_UNICAST_ADDRESS_LH; + +typedef struct _IP_ADAPTER_UNICAST_ADDRESS_XP { + union { + struct { + ULONG Length; + DWORD Flags; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_UNICAST_ADDRESS_XP *Next; + SOCKET_ADDRESS Address; + IP_PREFIX_ORIGIN PrefixOrigin; + IP_SUFFIX_ORIGIN SuffixOrigin; + IP_DAD_STATE DadState; + ULONG ValidLifetime; + ULONG PreferredLifetime; + ULONG LeaseLifetime; +} IP_ADAPTER_UNICAST_ADDRESS_XP, *PIP_ADAPTER_UNICAST_ADDRESS_XP; + +typedef IP_ADAPTER_UNICAST_ADDRESS_LH IP_ADAPTER_UNICAST_ADDRESS; +typedef IP_ADAPTER_UNICAST_ADDRESS_LH *PIP_ADAPTER_UNICAST_ADDRESS; typedef struct _IP_ADAPTER_ANYCAST_ADDRESS { union { @@ -277,8 +298,8 @@ typedef struct _IP_ADAPTER_ADDRESSES_XP { PIP_ADAPTER_PREFIX FirstPrefix; } IP_ADAPTER_ADDRESSES_XP, *PIP_ADAPTER_ADDRESSES_XP; -#define IP_ADAPTER_ADDRESSES IP_ADAPTER_ADDRESSES_LH -#define PIP_ADAPTER_ADDRESSES PIP_ADAPTER_ADDRESSES_LH +typedef IP_ADAPTER_ADDRESSES_LH IP_ADAPTER_ADDRESSES; +typedef IP_ADAPTER_ADDRESSES_LH *PIP_ADAPTER_ADDRESSES; #define GAA_FLAG_SKIP_UNICAST 0x00000001 #define GAA_FLAG_SKIP_ANYCAST 0x00000002

1 0

Nikolay Sivov : oledb32: Allow single quotation marks around property values.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 0cb665ca8a55226248deaec75c0fb562013fd604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb665ca8a55226248deaec75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 2 02:03:20 2017 +0300 oledb32: Allow single quotation marks around property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 9 +++++---- dlls/oledb32/tests/database.c | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 7401c88..7ed4099 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -401,18 +401,19 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) while (start && (eq = strchrW(start, '='))) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; + WCHAR *delim, quote; BSTR value, name; - WCHAR *delim; name = SysAllocStringLen(start, eq - start); /* skip equal sign to get value */ eq++; - if (*eq == '"') + quote = (*eq == '"' || *eq == '\'') ? *eq : 0; + if (quote) { /* for quoted value string, skip opening mark, look for terminating one */ eq++; - delim = strchrW(eq, '"'); + delim = strchrW(eq, quote); } else delim = strchrW(eq, ';'); @@ -422,7 +423,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) /* skip semicolon if present */ if (delim) { - if (*delim == '"') + if (*delim == quote) delim++; if (*delim == ';') delim++; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 8d07cd3..7f71f8b 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -295,6 +295,8 @@ static void test_database(void) static WCHAR extended_prop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s','=','\"','D','R','I','V','E','R','=','A', ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; + static WCHAR extended_prop2[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','\'','d','u','m','m','y','\'',';', + 'c','u','s','t','o','m','p','r','o','p','=','\'','1','2','3','.','4','\'',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -312,6 +314,7 @@ static void test_database(void) test_GetDataSource(initstring_lower); test_GetDataSource2(customprop); test_GetDataSource2(extended_prop); + test_GetDataSource2(extended_prop2); } static void free_dispparams(DISPPARAMS *params)

1 0

Nikolay Sivov : oledb32: Added GetDataSource() for DataLinks object.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 83d33b6f94b67f311b1f4fb34c49ba5ece16210e URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d33b6f94b67f311b1f4fb34… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 2 02:03:19 2017 +0300 oledb32: Added GetDataSource() for DataLinks object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 15 +++++++++++---- dlls/oledb32/dslocator.c | 5 +++-- dlls/oledb32/oledb_private.h | 3 +++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 8d6b8ef..7401c88 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -587,12 +587,10 @@ static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub) return r; } -static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD clsctx, - LPWSTR initstring, REFIID riid, IUnknown **datasource) +HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r','=',0}; static const WCHAR msdasqlW[] = {'M','S','D','A','S','Q','L',0}; - datainit *This = impl_from_IDataInitialize(iface); BOOL datasource_created = FALSE; IDBProperties *dbprops; DBPROPSET *propset; @@ -600,7 +598,6 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o CLSID provclsid; HRESULT hr; - TRACE("(%p)->(%p 0x%x %s %s %p)\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource); /* first get provider name */ provclsid = IID_NULL; @@ -727,6 +724,16 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o return hr; } +static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD clsctx, + LPWSTR initstring, REFIID riid, IUnknown **datasource) +{ + datainit *This = impl_from_IDataInitialize(iface); + + TRACE("(%p)->(%p 0x%x %s %s %p)\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource); + + return get_data_source(outer, clsctx, initstring, riid, datasource); +} + /* returns character length of string representation */ static int get_propvalue_length(DBPROP *prop) { diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 0d1a4a3..11ed3e9 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -221,9 +221,10 @@ static ULONG WINAPI datainitialize_Release(IDataInitialize *iface) static HRESULT WINAPI datainitialize_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD context, LPWSTR initstring, REFIID riid, IUnknown **datasource) { - FIXME("(%p)->(%p %#x %s %s %p): stub\n", iface, outer, context, debugstr_w(initstring), debugstr_guid(riid), + TRACE("(%p)->(%p %#x %s %s %p)\n", iface, outer, context, debugstr_w(initstring), debugstr_guid(riid), datasource); - return E_NOTIMPL; + + return get_data_source(outer, context, initstring, riid, datasource); } static HRESULT WINAPI datainitialize_GetInitializationString(IDataInitialize *iface, IUnknown *datasource, diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 8b1a40f..0b71a81 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -23,6 +23,9 @@ HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, + IUnknown **datasource) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Nikolay Sivov : oledb32: Added a stub IDataInitialize for DataLinks object.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: c2a6738f9a5c53eef7b172bdb781f6a29fe635b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a6738f9a5c53eef7b172bdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 2 02:03:18 2017 +0300 oledb32: Added a stub IDataInitialize for DataLinks object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 87 ++++++++++++++++++++++++++++++++++++++++++- dlls/oledb32/tests/database.c | 11 ++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 4af4ab4..0d1a4a3 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -39,7 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); typedef struct DSLocatorImpl { - IDataSourceLocator IDataSourceLocator_iface; + IDataSourceLocator IDataSourceLocator_iface; + IDataInitialize IDataInitialize_iface; LONG ref; HWND hwnd; @@ -50,6 +51,10 @@ static inline DSLocatorImpl *impl_from_IDataSourceLocator( IDataSourceLocator *i return CONTAINING_RECORD(iface, DSLocatorImpl, IDataSourceLocator_iface); } +static inline DSLocatorImpl *impl_from_IDataInitialize(IDataInitialize *iface) +{ + return CONTAINING_RECORD(iface, DSLocatorImpl, IDataInitialize_iface); +} static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID riid, void **ppvoid) { @@ -64,6 +69,10 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID { *ppvoid = &This->IDataSourceLocator_iface; } + else if (IsEqualIID(riid, &IID_IDataInitialize)) + { + *ppvoid = &This->IDataInitialize_iface; + } if(*ppvoid) { @@ -191,6 +200,81 @@ static const IDataSourceLocatorVtbl DSLocatorVtbl = dslocator_PromptEdit }; +static HRESULT WINAPI datainitialize_QueryInterface(IDataInitialize *iface, REFIID riid, void **obj) +{ + DSLocatorImpl *This = impl_from_IDataInitialize(iface); + return IDataSourceLocator_QueryInterface(&This->IDataSourceLocator_iface, riid, obj); +} + +static ULONG WINAPI datainitialize_AddRef(IDataInitialize *iface) +{ + DSLocatorImpl *This = impl_from_IDataInitialize(iface); + return IDataSourceLocator_AddRef(&This->IDataSourceLocator_iface); +} + +static ULONG WINAPI datainitialize_Release(IDataInitialize *iface) +{ + DSLocatorImpl *This = impl_from_IDataInitialize(iface); + return IDataSourceLocator_Release(&This->IDataSourceLocator_iface); +} + +static HRESULT WINAPI datainitialize_GetDataSource(IDataInitialize *iface, + IUnknown *outer, DWORD context, LPWSTR initstring, REFIID riid, IUnknown **datasource) +{ + FIXME("(%p)->(%p %#x %s %s %p): stub\n", iface, outer, context, debugstr_w(initstring), debugstr_guid(riid), + datasource); + return E_NOTIMPL; +} + +static HRESULT WINAPI datainitialize_GetInitializationString(IDataInitialize *iface, IUnknown *datasource, + boolean include_password, LPWSTR *initstring) +{ + FIXME("(%p)->(%d %p): stub\n", iface, include_password, initstring); + return E_NOTIMPL; +} + +static HRESULT WINAPI datainitialize_CreateDBInstance(IDataInitialize *iface, REFCLSID prov, IUnknown *outer, + DWORD clsctx, LPWSTR reserved, REFIID riid, IUnknown **datasource) +{ + FIXME("(%p)->(%s %p %#x %p %s %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved, + debugstr_guid(riid), datasource); + return E_NOTIMPL; +} + +static HRESULT WINAPI datainitialize_CreateDBInstanceEx(IDataInitialize *iface, REFCLSID prov, IUnknown *outer, + DWORD clsctx, LPWSTR reserved, COSERVERINFO *server_info, DWORD cmq, MULTI_QI *results) +{ + FIXME("(%p)->(%s %p %#x %p %p %u %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved, + server_info, cmq, results); + return E_NOTIMPL; +} + +static HRESULT WINAPI datainitialize_LoadStringFromStorage(IDataInitialize *iface, LPWSTR filename, LPWSTR *initstring) +{ + FIXME("(%p)->(%s %p): stub\n", iface, debugstr_w(filename), initstring); + return E_NOTIMPL; +} + +static HRESULT WINAPI datainitialize_WriteStringToStorage(IDataInitialize *iface, LPWSTR filename, LPWSTR initstring, + DWORD disposition) +{ + FIXME("(%p)->(%s %s %#x): stub\n", iface, debugstr_w(filename), debugstr_w(initstring), disposition); + return E_NOTIMPL; +} + +static const IDataInitializeVtbl ds_datainitialize_vtbl = +{ + datainitialize_QueryInterface, + datainitialize_AddRef, + datainitialize_Release, + datainitialize_GetDataSource, + datainitialize_GetInitializationString, + datainitialize_CreateDBInstance, + datainitialize_CreateDBInstanceEx, + datainitialize_LoadStringFromStorage, + datainitialize_WriteStringToStorage, +}; + HRESULT create_dslocator(IUnknown *outer, void **obj) { DSLocatorImpl *This; @@ -205,6 +289,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) if(!This) return E_OUTOFMEMORY; This->IDataSourceLocator_iface.lpVtbl = &DSLocatorVtbl; + This->IDataInitialize_iface.lpVtbl = &ds_datainitialize_vtbl; This->ref = 1; This->hwnd = 0; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 44a2561..8d07cd3 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -855,6 +855,7 @@ static void test_dslocator(void) ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) { + IDataInitialize *datainit, *datainit2; COMPATIBLE_LONG hwnd = 0; if (0) /* Crashes under Window 7 */ @@ -887,6 +888,16 @@ static void test_dslocator(void) ok(hr == S_OK, "got %08x\n", hr); ok(hwnd == 0, "got %p\n", (HWND)hwnd); + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IDataInitialize, (void **)&datainit); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IDataInitialize, (void **)&datainit2); + ok(hr == S_OK, "got %08x\n", hr); + ok(datainit == datainit2, "Got %p, previous %p\n", datainit, datainit2); + + IDataInitialize_Release(datainit2); + IDataInitialize_Release(datainit); + IDataSourceLocator_Release(dslocator); } }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 7380a7c2e2f13d19a80e6674cc4dbd9bb832a559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7380a7c2e2f13d19a80e6674c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 2 09:49:31 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 54 +++++++++++++++++------------------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1f120e7..3658e43d2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-11-10 09:53+0300\n" +"PO-Revision-Date: 2017-02-02 09:41+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -8364,10 +8364,8 @@ msgid "Wine Control Panel" msgstr "Панель Управления Wine" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Невозможно отобразить диалог Запуск файла (внутренняя ошибка)" +msgstr "Не удалось отобразить диалог запуска программ (внутренняя ошибка)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" @@ -11903,52 +11901,44 @@ msgid "(unknown %d)" msgstr "(неизвестно %d)" #: regedit.rc:212 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "Не удалось изменить выбранное значение." #: regedit.rc:213 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "Не удалось создать ключ реестра." #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "Не удалось создать новое значение." #: regedit.rc:215 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Не удалось переименовать ключ «%1».\n" +"Ключ с указанным именем уже существует." #: regedit.rc:216 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Не удалось переименовать значение «%1».\n" +"Значение с указанным именем уже существует." #: regedit.rc:217 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "Не удалось удалить выбранный ключ реестра." #: regedit.rc:218 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "Не удалось переименовать выбранный ключ реестра." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "Не удалось переименовать выбранное значение реестра." #: regedit.rc:371 msgid "" @@ -12177,32 +12167,24 @@ msgid "Displays program information, version number and copyright" msgstr "Отображает информацию о программе, номер версии и список авторов" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "Не удалось прочитать значение реестра «%1»." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Редактирование разделов типа (%u) не поддерживается" +msgstr "Редактирование значений типа (%1!u!) не поддерживается." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Значение слишком велико (%u)" +msgstr "Значение слишком велико (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" msgstr "Подтверждение" #: regedit.rc:189 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Искомая строка «%s» не найдена" +msgstr "Поиск завершён. Строка «%1» не найдена." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12217,10 +12199,8 @@ msgid "New Value #%d" msgstr "Новое значение #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: не удалось открыть ключ «%1».\n" +msgstr "Не удалось прочитать ключ реестра «%1»." #: regedit.rc:152 msgid "Adds a new multi-string value"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 5bcc295b36140d97eb725969807d8f41bb65fe23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcc295b36140d97eb7259698… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 2 08:05:22 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/po/lt.po b/po/lt.po index 350143a..88eee86 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-01-27 22:03+0300\n" +"PO-Revision-Date: 2017-02-02 08:02+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11904,52 +11904,44 @@ msgid "(unknown %d)" msgstr "(nežinomas %d)" #: regedit.rc:212 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko modifikuoti pasirinktos registro reikšmės." #: regedit.rc:213 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko sukurti naujo registro rakto." #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko sukurti naujos registro reikšmės." #: regedit.rc:215 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Nepavyko pervadinti rakto „%1“.\n" +"Nurodytas rakto vardas jau egzistuoja." #: regedit.rc:216 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Nepavyko pervadinti reikšmės „%1“.\n" +"Nurodytas reikšmės vardas jau egzistuoja." #: regedit.rc:217 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko pašalinti pasirinkto registro rakto." #: regedit.rc:218 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko pervadinti pasirinkto registro rakto." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko pervadinti pasirinktos registro reikšmės." #: regedit.rc:371 msgid "" @@ -12180,32 +12172,24 @@ msgid "Displays program information, version number and copyright" msgstr "Parodo informaciją apie programą, versijos numerį ir autoriaus teises" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko užklausti registro reikšmės „%1“." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Šio tipo raktų redaguoti negalima (%u)" +msgstr "Nepavyko redaguoti šio tipo registro raktų (%1!u!)." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Reikšmė per didelė (%u)" +msgstr "Reikšmė per didelė (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" msgstr "Reikšmės šalinimo patvirtinimas" #: regedit.rc:189 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Ieškoma eilutė „%s“ nerasta" +msgstr "Paieška baigta. Eilutė „%1“ nerasta." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12220,10 +12204,8 @@ msgid "New Value #%d" msgstr "Nauja reikšmė #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Nepavyko atverti registro rakto „%1“.\n" +msgstr "Nepavyko užklausti registro rakto „%1“." #: regedit.rc:152 msgid "Adds a new multi-string value"

1 0

Ken Thomases : winemac: Don't set a view's frame if the backend' s value hasn't changed.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 2a28e4d843ec5302f53a3168061fdf2ca30eb076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a28e4d843ec5302f53a31680… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 1 10:12:31 2017 -0600 winemac: Don't set a view's frame if the backend's value hasn't changed. With windows, the Cocoa main thread may have changed the frame and messages to that effect may be in the queue, so it can be important to reassert the "current" value and discard those messages. With views, by contrast, Cocoa will never change the frame on its own and there are no messages to discard. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6e0926c..e07507b 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1094,7 +1094,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c macdrv_set_view_frame(data->cocoa_view, frame); force_z_order = TRUE; } - else + else if (!EqualRect(&data->whole_rect, old_whole_rect)) macdrv_set_view_frame(data->cocoa_view, frame); }

1 0

Ken Thomases : winemac: Don' t attempt to set surface for child windows in macdrv_WindowPosChanged().
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: af54f956bfd4addb956584a0cceea4d990922b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af54f956bfd4addb956584a0c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 1 10:12:30 2017 -0600 winemac: Don't attempt to set surface for child windows in macdrv_WindowPosChanged(). The skipped code is a no-op for the child window case, except that the call to set_window_surface() synchronizes with the main thread, even with null arguments. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9824d99..6e0926c 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2021,7 +2021,7 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, data->window_rect = *window_rect; data->whole_rect = *visible_rect; data->client_rect = *client_rect; - if (!data->ulw_layered) + if (data->cocoa_window && !data->ulw_layered) { if (surface) window_surface_add_ref(surface); if (new_style & WS_MINIMIZE)

1 0

← Newer
1
...
76
77
78
79
80
81
82
83
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017