May 2012 - Wine-Commits - list.winehq.org

Hans Leidekker : secur32: Update NTLM capabilities to match native.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: bd7e46976077d83b8374dc6590d7b047342f18f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7e46976077d83b8374dc659… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:05:26 2012 +0200 secur32: Update NTLM capabilities to match native. --- dlls/secur32/ntlm.c | 18 ++++++++++-------- include/sspi.h | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index da02366..6a1199b 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1938,14 +1938,16 @@ static WCHAR ntlm_name_W[] = NTLM_NAME; /* According to Windows, NTLM has the following capabilities. */ #define CAPS ( \ - SECPKG_FLAG_INTEGRITY | \ - SECPKG_FLAG_PRIVACY | \ - SECPKG_FLAG_TOKEN_ONLY | \ - SECPKG_FLAG_CONNECTION | \ - SECPKG_FLAG_MULTI_REQUIRED | \ - SECPKG_FLAG_IMPERSONATION | \ - SECPKG_FLAG_ACCEPT_WIN32_NAME | \ - SECPKG_FLAG_READONLY_WITH_CHECKSUM) + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON | \ + SECPKG_FLAG_RESTRICTED_TOKENS ) static const SecPkgInfoW infoW = { CAPS, diff --git a/include/sspi.h b/include/sspi.h index 6e69c09..bd2241c 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -130,6 +130,7 @@ typedef struct _SecPkgInfoW #define SECPKG_FLAG_MUTUAL_AUTH 0x00010000 #define SECPKG_FLAG_DELEGATION 0x00020000 #define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 +#define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 #define SECPKG_ID_NONE 0xffff

1 0

Hans Leidekker : secur32: Add an option to disable use of cached Samba credentials.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 3181577810a6d14ac88866ea273eaf2165f104fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3181577810a6d14ac88866ea2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:05:48 2012 +0200 secur32: Add an option to disable use of cached Samba credentials. --- dlls/secur32/ntlm.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 6a1199b..38d2045 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -52,6 +52,7 @@ typedef struct _NtlmCredentials char *domain_arg; char *password; /* not nul-terminated */ int pwlen; + int no_cached_credentials; /* don't try to use cached Samba credentials */ } NtlmCredentials, *PNtlmCredentials; /*********************************************************************** @@ -141,7 +142,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; - PNtlmCredentials ntlm_cred = NULL; + PNtlmCredentials ntlm_cred; TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, @@ -160,6 +161,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; + ntlm_cred->no_cached_credentials = 0; + phCredential->dwUpper = fCredentialUse; phCredential->dwLower = (ULONG_PTR)ntlm_cred; ret = SEC_E_OK; @@ -178,6 +181,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; + ntlm_cred->no_cached_credentials = 0; if(pAuthData != NULL) { @@ -539,7 +543,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( else { status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui); - if (status != NERR_Success || ui == NULL) + if (status != NERR_Success || ui == NULL || ntlm_cred->no_cached_credentials) { ret = SEC_E_NO_CREDENTIALS; goto isc_end;

1 0

Piotr Caban : comctl32: Make icons not overlapping in LVS_ICON mode.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 25f347892e05da184d871ab23f1cb81a7869fa32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f347892e05da184d871ab23… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 10 11:01:46 2012 +0200 comctl32: Make icons not overlapping in LVS_ICON mode. --- dlls/comctl32/listview.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e507848..7111560 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8564,10 +8564,12 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) if (cy == -1) cy = GetSystemMetrics(SM_CYICONSPACING); /* if 0 then compute width - * FIXME: Should scan each item and determine max width of - * icon or label, then make that the width */ - if (cx == 0) - cx = infoPtr->iconSpacing.cx; + * FIXME: computed cx and cy is not matching native behaviour */ + if (cx == 0) { + cx = GetSystemMetrics(SM_CXICONSPACING); + if (infoPtr->iconSize.cx + ICON_LR_PADDING > cx) + cx = infoPtr->iconSize.cx + ICON_LR_PADDING; + } /* if 0 then compute height */ if (cy == 0)

1 0

Christian Costa : d3drm: Move some unsafe_impl_from_* call to where variables are declared.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 4a53e89c113b3beee3a9067acf131f025e646cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a53e89c113b3beee3a9067ac… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:52:20 2012 +0200 d3drm: Move some unsafe_impl_from_* call to where variables are declared. --- dlls/d3drm/frame.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index b3d2f60..60e8966 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -224,12 +224,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface, LPDIRECT3DRMFRAME child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *frame; + IDirect3DRMFrameImpl *frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); TRACE("(%p/%p)->(%p)\n", iface, This, child); - frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); - if (!frame) return D3DRMERR_BADOBJECT; @@ -524,12 +522,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteChild(IDirect3DRMFrame2* iface LPDIRECT3DRMFRAME frame) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *child; + IDirect3DRMFrameImpl *child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame); TRACE("(%p/%p)->(%p)\n", iface, This, frame); - child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame); - if (!child) return D3DRMERR_BADOBJECT;

1 0

Piotr Caban : comctl32: LVM_SETITEMTEXT is not supported on LVS_OWNERDATA.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 8276a3375b653cec5df2f823bf5b5ae08550152f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8276a3375b653cec5df2f823b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 10 11:19:37 2012 +0200 comctl32: LVM_SETITEMTEXT is not supported on LVS_OWNERDATA. --- dlls/comctl32/listview.c | 1 + dlls/comctl32/tests/listview.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ccabe6b..e507848 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8896,6 +8896,7 @@ static BOOL LISTVIEW_SetItemTextT(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE LVITEMW lvItem; if (!lpLVItem || nItem < 0 || nItem >= infoPtr->nItemCount) return FALSE; + if (infoPtr->dwStyle & LVS_OWNERDATA) return FALSE; lvItem.iItem = nItem; lvItem.iSubItem = lpLVItem->iSubItem; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c38bb61..b96e85f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2627,6 +2627,8 @@ static void test_sorting(void) static void test_ownerdata(void) { + static char test_str[] = "test"; + HWND hwnd; LONG_PTR style, ret; DWORD res; @@ -2711,7 +2713,7 @@ static void test_ownerdata(void) expect(1, res); DestroyWindow(hwnd); - /* LVM_SETITEM is unsupported on LVS_OWNERDATA */ + /* LVM_SETITEM and LVM_SETITEMTEXT is unsupported on LVS_OWNERDATA */ hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); @@ -2725,6 +2727,10 @@ static void test_ownerdata(void) item.state = LVIS_SELECTED; res = SendMessageA(hwnd, LVM_SETITEM, 0, (LPARAM)&item); expect(FALSE, res); + memset(&item, 0, sizeof(item)); + item.pszText = test_str; + res = SendMessageA(hwnd, LVM_SETITEMTEXT, 0, (LPARAM)&item); + expect(FALSE, res); DestroyWindow(hwnd); /* check notifications after focused/selected changed */

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 8c3a1eb759b75e1d24e3c98b14359dd335a29c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3a1eb759b75e1d24e3c98b1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 9 23:16:23 2012 +0900 po: Update Japanese translation. --- po/ja.po | 222 +++++++++++++++++++++++++------------------------------------- 1 files changed, 88 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c3a1eb759b75e1d24e3c…

1 0

Alexandre Julliard : wininet/tests: Mark a failing test as broken.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 0b3b6ba26df9b072e72a3584409d1dcceecfb752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3b6ba26df9b072e72a35844… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 23:20:51 2012 +0200 wininet/tests: Mark a failing test as broken. --- dlls/wininet/tests/internet.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index fc15b2a..7b0ee47 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -284,8 +284,9 @@ static void test_max_conns(void) val = 0; res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)); - ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER, 0) succeeded\n"); - ok(GetLastError() == ERROR_BAD_ARGUMENTS, "GetLastError() = %u\n", GetLastError()); + ok(!res || broken(res), /* <= w2k3 */ + "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER, 0) succeeded\n"); + if (!res) ok(GetLastError() == ERROR_BAD_ARGUMENTS, "GetLastError() = %u\n", GetLastError()); val = 2; res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)-1);

1 0

Alexandre Julliard : kernel32/tests: Remove a couple of invalid tests.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 5f20ecc62a774eb295ed3222d5842eecb68c8d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f20ecc62a774eb295ed3222d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 23:21:07 2012 +0200 kernel32/tests: Remove a couple of invalid tests. --- dlls/kernel32/tests/virtual.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 73a5206..d02ca34 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -851,7 +851,6 @@ static void test_MapViewOfFile(void) ret = VirtualQuery(ptr, &info, sizeof(info)); ok(ret, "VirtualQuery error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); - ok(info.RegionSize != MAPPING_SIZE, "got size %#lx\n", info.RegionSize); ok(info.Protect == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", info.Protect); ok(info.AllocationBase == NULL, "%p != NULL\n", info.AllocationBase); ok(info.AllocationProtect == 0, "%#x != 0\n", info.AllocationProtect); @@ -932,7 +931,6 @@ static void test_MapViewOfFile(void) ret = VirtualQuery(ptr, &info, sizeof(info)); ok(ret, "VirtualQuery error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); - ok(info.RegionSize != MAPPING_SIZE, "got size %#lx\n", info.RegionSize); ok(info.Protect == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", info.Protect); ok(info.AllocationBase == NULL, "%p != NULL\n", info.AllocationBase); ok(info.AllocationProtect == 0, "%#x != 0\n", info.AllocationProtect);

1 0

Nikolay Sivov : msxml3/tests: Really test load() on files with leading spaces.
by Alexandre Julliard May 9, 2012

May 9, 2012

Module: wine Branch: master Commit: 9c0486d7a802c2f618a56a2074c5d790d329e3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0486d7a802c2f618a56a207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 9 20:30:58 2012 +0400 msxml3/tests: Really test load() on files with leading spaces. --- dlls/msxml3/tests/domdoc.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 09165c3..2aa2906 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2061,8 +2061,12 @@ static void test_domdoc( void ) LONG code, ref; LONG nLength = 0; WCHAR buff[100]; + char path[MAX_PATH]; int index; + GetTempPathA(MAX_PATH, path); + strcat(path, "leading_spaces.xml"); + /* Load document with leading spaces * * Test all CLSIDs with all test data XML strings @@ -2087,13 +2091,24 @@ static void test_domdoc( void ) i = 0; while (*data_ptr) { BSTR data = _bstr_(*data_ptr); + DWORD written; + HANDLE file; + + file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "can't create file %s: %u\n", path, GetLastError()); + + WriteFile(file, data, lstrlenW(data)*sizeof(WCHAR), &written, NULL); + CloseHandle(file); b = 0xc; V_VT(&var) = VT_BSTR; - V_BSTR(&var) = data; + V_BSTR(&var) = _bstr_(path); hr = IXMLDOMDocument_load(doc, var, &b); + todo_wine { EXPECT_HR(hr, class_ptr->ret[0].hr); ok(b == class_ptr->ret[0].b, "%d:%d, got %d, expected %d\n", index, i, b, class_ptr->ret[0].b); + } + DeleteFileA(path); b = 0xc; hr = IXMLDOMDocument_loadXML(doc, data, &b); @@ -2103,8 +2118,10 @@ static void test_domdoc( void ) data_ptr++; i++; } + class_ptr++; index++; + free_bstrs(); } doc = create_document(&IID_IXMLDOMDocument);

1 0

Nikolay Sivov : msxml3/tests: Correct variant type.
by Alexandre Julliard May 9, 2012

May 9, 2012

Module: wine Branch: master Commit: b2a5d37a468b38e89f6790c6763a3b2df8b76097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a5d37a468b38e89f6790c67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 9 20:13:32 2012 +0400 msxml3/tests: Correct variant type. --- dlls/msxml3/tests/saxreader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 73c16b9..0a0651b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1992,7 +1992,7 @@ static void test_saxreader(void) IStream_Write(stream, testXML, strlen(testXML), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; set_expected_seq(test_seq); @@ -2008,7 +2008,7 @@ static void test_saxreader(void) IStream_Write(stream, test_attributes, strlen(test_attributes), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40)) @@ -2151,7 +2151,7 @@ static void test_saxreader(void) IStream_Write(stream, test_attributes, strlen(test_attributes), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || @@ -2179,7 +2179,7 @@ static void test_saxreader(void) IStream_Write(stream, test_attributes, strlen(test_attributes), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || @@ -2205,7 +2205,7 @@ static void test_saxreader(void) IStream_Write(stream, attribute_normalize, strlen(attribute_normalize), &written); pos.QuadPart = 0; IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) ||

1 0