September 2009 - Wine-commits

Aric Stewart : advapi32: Implement LsaLookupSids.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: caf66f0fe28da8964b5f84be682c527559fb9e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf66f0fe28da8964b5f84be6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 24 08:38:35 2009 -0500 advapi32: Implement LsaLookupSids. --- dlls/advapi32/lsa.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 796fa45..a0a332e 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -408,9 +408,50 @@ NTSTATUS WINAPI LsaLookupSids( OUT PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, OUT PLSA_TRANSLATED_NAME *Names ) { - FIXME("(%p,%u,%p,%p,%p) stub\n", PolicyHandle, Count, Sids, + ULONG i, mapped, size; + ULONG name_size, domain_size; + SID_NAME_USE use; + + TRACE("(%p,%u,%p,%p,%p) stub\n", PolicyHandle, Count, Sids, ReferencedDomains, Names); + size = sizeof(LSA_TRANSLATED_NAME) * Count; + if (!(*Names = HeapAlloc( GetProcessHeap(), 0, size) )) return STATUS_NO_MEMORY; + if (!(*ReferencedDomains = HeapAlloc( GetProcessHeap(), 0, sizeof(LSA_REFERENCED_DOMAIN_LIST)) )) + { + HeapFree( GetProcessHeap(), 0, *Names); + return STATUS_NO_MEMORY; + } + (*ReferencedDomains)->Entries = 0; + (*ReferencedDomains)->Domains = NULL; + + mapped = 0; + for (i = 0; i < Count; i++) + { + name_size = domain_size = 0; + (*Names)[i].Use = SidTypeUnknown; + (*Names)[i].DomainIndex = -1; + (*Names)[i].Name.Length = 0; + (*Names)[i].Name.MaximumLength = 0; + (*Names)[i].Name.Buffer = NULL; + if (LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use)) + { + if (domain_size) + FIXME("domains not handled\n"); + mapped++; + + domain_size = 0; + (*Names)[i].Use = use; + (*Names)[i].Name.Length = name_size * sizeof(WCHAR); + (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR); + (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(),0,name_size * sizeof(WCHAR)); + LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, NULL, &domain_size, &use); + } + } + TRACE("mapped %u out of %u\n",mapped,Count); + + if (mapped == Count) return STATUS_SUCCESS; + if (mapped) return STATUS_SOME_NOT_MAPPED; return STATUS_NONE_MAPPED; }

1 0

Ge van Geldorp : rpcrt4/tests: Fix cstub test on Win7.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 55230ba6e0a2705dd1e9c5c527cb2390e3cd563b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55230ba6e0a2705dd1e9c5c52… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Thu Sep 24 15:37:24 2009 +0200 rpcrt4/tests: Fix cstub test on Win7. --- dlls/rpcrt4/tests/cstub.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 1ce24ce..ca871b7 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -408,6 +408,28 @@ static int __stdcall iid_lookup( const IID * pIID, int * pIndex ) } +static BOOL check_address(void *actual, void *expected) +{ + static void *ole32_start = NULL; + static void *ole32_end = NULL; + + if (actual == expected) + return TRUE; + + /* On Win7, actual can be located inside ole32.dll */ + if (ole32_start == NULL || ole32_end == NULL) + { + PIMAGE_NT_HEADERS nt_headers; + ole32_start = (void *) GetModuleHandleA("ole32.dll"); + if (ole32_start == NULL) + return FALSE; + nt_headers = (PIMAGE_NT_HEADERS)((char *) ole32_start + ((PIMAGE_DOS_HEADER) ole32_start)->e_lfanew); + ole32_end = (void *)((char *) ole32_start + nt_headers->OptionalHeader.SizeOfImage); + } + + return ole32_start <= actual && actual < ole32_end; +} + static const ExtendedProxyFileInfo my_proxy_file_info = { (const PCInterfaceProxyVtblList *) &cstub_ProxyVtblList, @@ -477,7 +499,7 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) ok(stub_vtbl[i]->Vtbl.name != CStd_##name, #name "vtbl %d updated %p %p\n", \ i, stub_vtbl[i]->Vtbl.name, CStd_##name ) #define VTBL_TEST_CHANGE_TO(name, i) \ - ok(stub_vtbl[i]->Vtbl.name == CStd_##name, #name "vtbl %d not updated %p %p\n", \ + ok(check_address(stub_vtbl[i]->Vtbl.name, CStd_##name), #name "vtbl %d not updated %p %p\n", \ i, stub_vtbl[i]->Vtbl.name, CStd_##name ) #define VTBL_TEST_ZERO(name, i) \ ok(stub_vtbl[i]->Vtbl.name == NULL, #name "vtbl %d not null %p\n", \ @@ -528,7 +550,7 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) VTBL_TEST_CHANGE_TO(DebugServerRelease, 3); #define VTBL_PROXY_TEST(i,num,ptr) \ - ok( proxy_vtbl[i]->Vtbl[num] == (ptr), "wrong proxy %u func %u %p/%p\n", \ + ok( check_address(proxy_vtbl[i]->Vtbl[num], (ptr)), "wrong proxy %u func %u %p/%p\n", \ (i), (num), proxy_vtbl[i]->Vtbl[num], (ptr) ) #define VTBL_PROXY_TEST_NOT_ZERO(i,num) \ ok( proxy_vtbl[i]->Vtbl[num] != NULL, "wrong proxy %u func %u is NULL\n", (i), (num))

1 0

Ge van Geldorp : mshtml/tests: Fix copyright notice.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 75de8dc9ce1d5b018fc0a44ac1965f020d21f2d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75de8dc9ce1d5b018fc0a44ac… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Thu Sep 24 15:36:55 2009 +0200 mshtml/tests: Fix copyright notice. --- dlls/mshtml/tests/mshtml_test.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/mshtml_test.h b/dlls/mshtml/tests/mshtml_test.h index 7768f75..7f2cdf2 100644 --- a/dlls/mshtml/tests/mshtml_test.h +++ b/dlls/mshtml/tests/mshtml_test.h @@ -1,5 +1,5 @@ /* - * Copyright 2009 Ge van Geldorp + * Copyright 2009 Ge van Geldorp for VMware, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Alexandre Julliard : ntdll: Silence a noisy FIXME.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 66b9371bb6094bc70eaeb7ade45a76ae9b0a6d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b9371bb6094bc70eaeb7ade… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 24 15:32:23 2009 +0200 ntdll: Silence a noisy FIXME. --- dlls/ntdll/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 62f6743..4ad84dc 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2243,6 +2243,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io { int fd, needs_close; struct stat st; + static int once; if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )) != STATUS_SUCCESS) return io->u.Status; @@ -2253,7 +2254,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io switch( info_class ) { case FileFsVolumeInformation: - FIXME( "%p: volume info not supported\n", handle ); + if (!once++) FIXME( "%p: volume info not supported\n", handle ); break; case FileFsLabelInformation: FIXME( "%p: label info not supported\n", handle );

1 0

Dylan Smith : richedit: Silence fixme for WM_STYLECHANGING & WM_STYLECHANGED.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 99b37b23767df6e8c90ebd9b9a5da81b8d3b239a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99b37b23767df6e8c90ebd9b9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 24 09:02:51 2009 -0400 richedit: Silence fixme for WM_STYLECHANGING & WM_STYLECHANGED. --- dlls/riched20/editor.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4726d4e..09e3de6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -141,8 +141,8 @@ + WM_PASTE + WM_SETFONT + WM_SETTEXT (resets undo stack !) (proper style?) ANSI&Unicode - - WM_STYLECHANGING - - WM_STYLECHANGED (things like read-only flag) + + WM_STYLECHANGING (seems to do nothing) + + WM_STYLECHANGED (seems to do nothing) + WM_UNICHAR + WM_VSCROLL @@ -2997,8 +2997,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_SETTABSTOPS) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) - UNSUPPORTED_MSG(WM_STYLECHANGING) - UNSUPPORTED_MSG(WM_STYLECHANGED) /* Messages specific to Richedit controls */

1 0

Huw Davies : oledb32: Implement conversions to DBTYPE_WSTR.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 91ef7037b77098c329d037b4a722cb5f3e317905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ef7037b77098c329d037b4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 24 12:20:10 2009 +0100 oledb32: Implement conversions to DBTYPE_WSTR. --- dlls/oledb32/convert.c | 35 ++++++++++++ dlls/oledb32/tests/convert.c | 123 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 6cdc9d6..c1e99be 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -128,6 +128,8 @@ static int get_length(DBTYPE type) return 8; case DBTYPE_BSTR: return sizeof(BSTR); + case DBTYPE_WSTR: + return 0; default: FIXME("Unhandled type %04x\n", type); return 0; @@ -277,6 +279,39 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + + case DBTYPE_WSTR: + { + BSTR b; + DBLENGTH bstr_len; + INT bytes_to_copy; + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, + src, &b, sizeof(BSTR), src_status, dst_status, + precision, scale, flags); + if(hr != S_OK) return hr; + bstr_len = SysStringLen(b); + *dst_len = bstr_len * sizeof(WCHAR); /* Doesn't include size for '\0' */ + *dst_status = DBSTATUS_S_OK; + bytes_to_copy = min(*dst_len + sizeof(WCHAR), dst_max_len); + if(dst) + { + if(bytes_to_copy >= sizeof(WCHAR)) + { + memcpy(dst, b, bytes_to_copy - sizeof(WCHAR)); + *((WCHAR*)dst + bytes_to_copy / sizeof(WCHAR) - 1) = 0; + if(bytes_to_copy < *dst_len + sizeof(WCHAR)) + *dst_status = DBSTATUS_S_TRUNCATED; + } + else + { + *dst_status = DBSTATUS_E_DATAOVERFLOW; + hr = DB_E_ERRORSOCCURRED; + } + } + SysFreeString(b); + return hr; + } + default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 658670f..376a8cc 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -900,6 +900,128 @@ static void test_converttobstr(void) IDataConvert_Release(convert); } +static void test_converttowstr(void) +{ + IDataConvert *convert; + HRESULT hr; + WCHAR dst[100]; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + static const WCHAR ten[] = {'1','0',0}; + static const WCHAR fourthreetwoone[] = {'4','3','2','1',0}; + BSTR b; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 0, "got %d\n", dst_len); + ok(dst[0] == 0, "got %02x\n", dst[0]); + ok(dst[1] == 0xcccc, "got %02x\n", dst[1]); + + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == 0, "got %d\n", dst_len); + ok(dst[0] == 0xcccc, "got %02x\n", dst[0]); + + *(short *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + + *(short *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_WSTR, 0, &dst_len, src, dst, 0, 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == 0xcccc, "got %02x\n", dst[0]); + + *(short *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_WSTR, 0, &dst_len, src, NULL, 0, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == 0xcccc, "got %02x\n", dst[0]); + + *(short *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_WSTR, 0, &dst_len, src, dst, 4, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == 0, "got %02x\n", dst[1]); + ok(dst[2] == 0xcccc, "got %02x\n", dst[2]); + + *(short *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_WSTR, 0, &dst_len, src, dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == 0, "got %02x\n", dst[0]); + ok(dst[1] == 0xcccc, "got %02x\n", dst[1]); + + *(short *)src = 4321; + memset(dst, 0xcc, sizeof(dst)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_WSTR, 0, &dst_len, src, dst, 8, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(dst[0] == '4', "got %02x\n", dst[0]); + ok(dst[1] == '3', "got %02x\n", dst[1]); + ok(dst[2] == '2', "got %02x\n", dst[2]); + ok(dst[3] == 0, "got %02x\n", dst[3]); + ok(dst[4] == 0xcccc, "got %02x\n", dst[4]); + + b = SysAllocString(ten); + *(BSTR *)src = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); + SysFreeString(b); + + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_WSTR, 2, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 2, "got %d\n", dst_len); + ok(dst[0] == '1', "got %02x\n", dst[0]); + ok(dst[1] == 0, "got %02x\n", dst[1]); + + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_WSTR, 4, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(!lstrcmpW(ten, dst), "got %s\n", wine_dbgstr_w(dst)); + + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(!lstrcmpW(ten, dst), "got %s\n", wine_dbgstr_w(dst)); + + IDataConvert_Release(convert); +} START_TEST(convert) { @@ -909,5 +1031,6 @@ START_TEST(convert) test_converttoi2(); test_converttoi4(); test_converttobstr(); + test_converttowstr(); OleUninitialize(); }

1 0

Huw Davies : oledb32: Implement conversions to DBTYPE_BSTR.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: a2e069b15989af1b2c2f2f33c6df6645a72fe91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e069b15989af1b2c2f2f33c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 23 14:46:55 2009 +0100 oledb32: Implement conversions to DBTYPE_BSTR. --- dlls/oledb32/convert.c | 27 +++++++++++++++++++ dlls/oledb32/tests/convert.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 6af4f09..6cdc9d6 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -126,6 +126,8 @@ static int get_length(DBTYPE type) case DBTYPE_I8: case DBTYPE_UI8: return 8; + case DBTYPE_BSTR: + return sizeof(BSTR); default: FIXME("Unhandled type %04x\n", type); return 0; @@ -250,6 +252,31 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_BSTR: + { + BSTR *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = SysAllocStringLen(NULL, 0); hr = *d ? S_OK : E_OUTOFMEMORY; break; + case DBTYPE_I2: hr = VarBstrFromI2(*(signed short*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_I4: hr = VarBstrFromI4(*(signed int*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_R4: hr = VarBstrFromR4(*(FLOAT*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_R8: hr = VarBstrFromR8(*(double*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_CY: hr = VarBstrFromCy(*(CY*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_DATE: hr = VarBstrFromDate(*(DATE*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BSTR: *d = SysAllocStringLen(*(BSTR*)src, SysStringLen(*(BSTR*)src)); hr = *d ? S_OK : E_OUTOFMEMORY; break; + case DBTYPE_BOOL: hr = VarBstrFromBool(*(VARIANT_BOOL*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_DECIMAL: hr = VarBstrFromDec((DECIMAL*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_I1: hr = VarBstrFromI1(*(signed char*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_UI1: hr = VarBstrFromUI1(*(BYTE*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_UI2: hr = VarBstrFromUI2(*(WORD*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_UI4: hr = VarBstrFromUI4(*(DWORD*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_I8: hr = VarBstrFromI8(*(LONGLONG*)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_UI8: hr = VarBstrFromUI8(*(ULONGLONG*)src, LOCALE_USER_DEFAULT, 0, d); break; + default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; + } + break; + } default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 156c5ca..658670f 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -843,6 +843,63 @@ todo_wine IDataConvert_Release(convert); } +static void test_converttobstr(void) +{ + IDataConvert *convert; + HRESULT hr; + BSTR dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + static const WCHAR ten[] = {'1','0',0}; + BSTR b; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_BSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst != NULL, "got %p\n", dst); + ok(SysStringLen(dst) == 0, "got %d\n", SysStringLen(dst)); + SysFreeString(dst); + + dst = (void*)0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_BSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst == (void*)0x1234, "got %p\n", dst); + + *(short *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_BSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst != NULL, "got %p\n", dst); + ok(SysStringLen(dst) == 4, "got %d\n", SysStringLen(dst)); + SysFreeString(dst); + + b = SysAllocString(ten); + *(BSTR *)src = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_BSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst != NULL, "got %p\n", dst); + ok(dst != b, "got %p src %p\n", dst, b); + ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); + SysFreeString(dst); + SysFreeString(b); + + IDataConvert_Release(convert); +} + START_TEST(convert) { @@ -851,5 +908,6 @@ START_TEST(convert) test_canconvert(); test_converttoi2(); test_converttoi4(); + test_converttobstr(); OleUninitialize(); }

1 0

Huw Davies : oledb32: Add conversions to DBTYPE_I2.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 12037aa441005758f0fe0aec24cdbe558644b331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12037aa441005758f0fe0aec2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 23 13:42:53 2009 +0100 oledb32: Add conversions to DBTYPE_I2. --- dlls/oledb32/convert.c | 26 ++++ dlls/oledb32/tests/convert.c | 271 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 297 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12037aa441005758f0fe0…

1 0

Aric Stewart : shlwapi: Implement StrChrNW.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 0443f2c7d13076e9e3da17207a8030bd376add62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0443f2c7d13076e9e3da17207… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 24 07:31:17 2009 -0500 shlwapi: Implement StrChrNW. --- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 19 +++++++++++++++++++ dlls/shlwapi/tests/string.c | 24 ++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 4acda49..3427722 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -757,6 +757,7 @@ @ stdcall StrChrA (str long) @ stdcall StrChrIA (str long) @ stdcall StrChrIW (wstr long) +@ stdcall StrChrNW(wstr long long) @ stdcall StrChrW (wstr long) @ stdcall StrCmpIW (wstr wstr) @ stdcall StrCmpLogicalW(wstr wstr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 755360d..cfb59ea 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -319,6 +319,25 @@ LPWSTR WINAPI StrChrIW(LPCWSTR lpszStr, WCHAR ch) } /************************************************************************* + * StrChrNW [SHLWAPI.@] + */ +LPWSTR WINAPI StrChrNW(LPCWSTR lpszStr, WCHAR ch, UINT cchMax) +{ + TRACE("(%s(%i),%i)\n", debugstr_wn(lpszStr,cchMax), cchMax, ch); + + if (lpszStr) + { + while (*lpszStr && cchMax-- > 0) + { + if (*lpszStr == ch) + return (LPWSTR)lpszStr; + lpszStr++; + } + } + return NULL; +} + +/************************************************************************* * StrCmpIW [SHLWAPI.@] * * Compare two strings, ignoring case. diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index fa50626..eae8905 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -58,6 +58,7 @@ static HRESULT (WINAPI *pStrRetToBufA)(STRRET*,LPCITEMIDLIST,LPSTR,UINT); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); +static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); static int strcmpW(const WCHAR *str1, const WCHAR *str2) { @@ -373,6 +374,27 @@ static void test_StrCpyW(void) } } +static void test_StrChrNW(void) +{ + static WCHAR string[] = {'T','e','s','t','i','n','g',' ','S','t','r','i','n','g',0}; + LPWSTR p; + + if (!pStrChrNW) + { + win_skip("StrChrNW not available\n"); + return; + } + + p = pStrChrNW(string,'t',10); + ok(*p=='t',"Found wrong 't'\n"); + ok(*(p+1)=='i',"next should be 'i'\n"); + + p = pStrChrNW(string,'S',10); + ok(*p=='S',"Found wrong 'S'\n"); + + p = pStrChrNW(string,'r',10); + ok(p==NULL,"Should not have found 'r'\n"); +} static void test_StrToIntA(void) { @@ -911,6 +933,7 @@ START_TEST(string) pStrCatBuffW = (void *)GetProcAddress(hShlwapi, "StrCatBuffW"); pStrCpyNXA = (void *)GetProcAddress(hShlwapi, (LPSTR)399); pStrCpyNXW = (void *)GetProcAddress(hShlwapi, (LPSTR)400); + pStrChrNW = (void *)GetProcAddress(hShlwapi, "StrChrNW"); pStrFormatByteSize64A = (void *)GetProcAddress(hShlwapi, "StrFormatByteSize64A"); pStrFormatKBSizeA = (void *)GetProcAddress(hShlwapi, "StrFormatKBSizeA"); pStrFormatKBSizeW = (void *)GetProcAddress(hShlwapi, "StrFormatKBSizeW"); @@ -929,6 +952,7 @@ START_TEST(string) test_StrRChrA(); test_StrRChrW(); test_StrCpyW(); + test_StrChrNW(); test_StrToIntA(); test_StrToIntW(); test_StrToIntExA();

1 0

Rein Klazes : user32: In ScrollWindowEx do not clip the clipping rectangle with the scrolling rectangle .
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 1775ab4a114fd646d2820ff7ed83394ba82910f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1775ab4a114fd646d2820ff7e… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Sep 24 11:17:26 2009 +0200 user32: In ScrollWindowEx do not clip the clipping rectangle with the scrolling rectangle. --- dlls/user32/painting.c | 3 +- dlls/user32/tests/win.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 6c15ec6..4af522d 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1404,11 +1404,12 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, hwnd = WIN_GetFullHandle( hwnd ); GetClientRect(hwnd, &rc); - if (rect) IntersectRect(&rc, &rc, rect); if (clipRect) IntersectRect(&cliprc,&rc,clipRect); else cliprc = rc; + if (rect) IntersectRect(&rc, &rc, rect); + if( hrgnUpdate ) bOwnRgn = FALSE; else if( bUpdate ) hrgnUpdate = CreateRectRgn( 0, 0, 0, 0 ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cf1de25..94e1d2b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3218,6 +3218,56 @@ static void test_window_styles(void) check_window_style(0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE); } +static void test_scrollwindow( HWND hwnd) +{ + HDC hdc; + RECT rc, rc2, rc3; + COLORREF colr; + + ShowWindow( hwnd, SW_SHOW); + UpdateWindow( hwnd); + GetClientRect( hwnd, &rc); + hdc = GetDC( hwnd); + /* test ScrollWindow(Ex) with no clip rectangle */ + /* paint the lower half of the window black */ + rc2 = rc; + rc2.top = ( rc2.top + rc2.bottom) / 2; + FillRect( hdc, &rc2, GetStockObject(BLACK_BRUSH)); + /* paint the upper half of the window white */ + rc2.bottom = rc2.top; + rc2.top =0; + FillRect( hdc, &rc2, GetStockObject(WHITE_BRUSH)); + /* scroll lower half up */ + rc2 = rc; + rc2.top = ( rc2.top + rc2.bottom) / 2; + ScrollWindowEx( hwnd, 0, - rc2.top, &rc2, NULL, NULL, NULL, SW_ERASE); + /* expected: black should have scrolled to the upper half */ + colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2, rc2.bottom / 4 ); + ok ( colr == 0, "pixel should be black, color is %08x\n", colr); + /* Repeat that test of ScrollWindow(Ex) now with clip rectangle */ + /* paint the lower half of the window black */ + rc2 = rc; + rc2.top = ( rc2.top + rc2.bottom) / 2; + FillRect( hdc, &rc2, GetStockObject(BLACK_BRUSH)); + /* paint the upper half of the window white */ + rc2.bottom = rc2.top; + rc2.top =0; + FillRect( hdc, &rc2, GetStockObject(WHITE_BRUSH)); + /* scroll lower half up */ + rc2 = rc; + rc2.top = ( rc2.top + rc2.bottom) / 2; + rc3 = rc; + rc3.left = rc3.right / 4; + rc3.right -= rc3.right / 4; + ScrollWindowEx( hwnd, 0, - rc2.top, &rc2, &rc3, NULL, NULL, SW_ERASE); + /* expected: black should have scrolled to the upper half */ + colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2, rc2.bottom / 4 ); + ok ( colr == 0, "pixel should be black, color is %08x\n", colr); + + /* clean up */ + ReleaseDC( hwnd, hdc); +} + static void test_scrollvalidate( HWND parent) { HDC hdc; @@ -5724,6 +5774,7 @@ START_TEST(win) test_mouse_input(hwndMain); test_validatergn(hwndMain); test_nccalcscroll( hwndMain); + test_scrollwindow( hwndMain); test_scrollvalidate( hwndMain); test_scrolldc( hwndMain); test_scroll();

1 0