wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Juan Lang : crypt32: Trace cert policies extension.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 777ea81c48c6260bddefa80276096729821a4a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=777ea81c48c6260bddefa8027… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 11:09:20 2009 -0700 crypt32: Trace cert policies extension. --- dlls/crypt32/chain.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c4250dc..0380687 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -782,6 +782,33 @@ static void dump_key_usage(const CERT_EXTENSION *ext) } } +static void dump_cert_policies(const CERT_EXTENSION *ext) +{ + CERT_POLICIES_INFO *policies; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_POLICIES, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + &policies, &size)) + { + DWORD i, j; + + TRACE_(chain)("%d policies:\n", policies->cPolicyInfo); + for (i = 0; i < policies->cPolicyInfo; i++) + { + TRACE_(chain)("policy identifier: %s\n", + debugstr_a(policies->rgPolicyInfo[i].pszPolicyIdentifier)); + TRACE_(chain)("%d policy qualifiers:\n", + policies->rgPolicyInfo[i].cPolicyQualifier); + for (j = 0; j < policies->rgPolicyInfo[i].cPolicyQualifier; j++) + TRACE_(chain)("%s\n", debugstr_a( + policies->rgPolicyInfo[i].rgPolicyQualifier[j]. + pszPolicyQualifierId)); + } + LocalFree(policies); + } +} + static void dump_enhanced_key_usage(const CERT_EXTENSION *ext) { CERT_ENHKEY_USAGE *usage; @@ -810,6 +837,8 @@ static void dump_extension(const CERT_EXTENSION *ext) dump_key_usage(ext); else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS2)) dump_basic_constraints2(ext); + else if (!strcmp(ext->pszObjId, szOID_CERT_POLICIES)) + dump_cert_policies(ext); else if (!strcmp(ext->pszObjId, szOID_ENHANCED_KEY_USAGE)) dump_enhanced_key_usage(ext); }

1 0

Juan Lang : crypt32: Trace enhanced key usage extension.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 994d7ed40d69871bd7e2ad3d827138ccbf7497ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=994d7ed40d69871bd7e2ad3d8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 23 10:59:30 2009 -0700 crypt32: Trace enhanced key usage extension. --- dlls/crypt32/chain.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ccb3dc7..c4250dc 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -782,6 +782,24 @@ static void dump_key_usage(const CERT_EXTENSION *ext) } } +static void dump_enhanced_key_usage(const CERT_EXTENSION *ext) +{ + CERT_ENHKEY_USAGE *usage; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ENHANCED_KEY_USAGE, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + &usage, &size)) + { + DWORD i; + + TRACE_(chain)("%d usages:\n", usage->cUsageIdentifier); + for (i = 0; i < usage->cUsageIdentifier; i++) + TRACE_(chain)("%s\n", usage->rgpszUsageIdentifier[i]); + LocalFree(usage); + } +} + static void dump_extension(const CERT_EXTENSION *ext) { TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId), @@ -792,6 +810,8 @@ static void dump_extension(const CERT_EXTENSION *ext) dump_key_usage(ext); else if (!strcmp(ext->pszObjId, szOID_BASIC_CONSTRAINTS2)) dump_basic_constraints2(ext); + else if (!strcmp(ext->pszObjId, szOID_ENHANCED_KEY_USAGE)) + dump_enhanced_key_usage(ext); } static LPCWSTR filetime_to_str(const FILETIME *time)

1 0

Alexandre Julliard : kernel32/tests: Add some tests for width and precision formatting in FormatMessage.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 549116bd68a806d924a6d08811be9badf8e123d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549116bd68a806d924a6d0881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 13:06:12 2009 +0100 kernel32/tests: Add some tests for width and precision formatting in FormatMessage. --- dlls/kernel32/format_msg.c | 5 +- dlls/kernel32/tests/format_msg.c | 86 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index e8f9fbc..7145479 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -493,10 +493,9 @@ DWORD WINAPI FormatMessageW( /* possible invalid pointers */ xarr[1]=*(argliststart+1); xarr[2]=*(argliststart+2); - sprintfbuf=HeapAlloc(GetProcessHeap(),0,(strlenW((LPWSTR)argliststart[0])*2+1)*sizeof(WCHAR)); - + sprintfbuf = HeapAlloc(GetProcessHeap(), 0, 1000); /* CMF - This makes a BIG assumption about va_list */ - vsprintfW(sprintfbuf, fmtstr, (va_list) xarr); + vsnprintfW(sprintfbuf, 1000, fmtstr, (va_list) xarr); } else if (strcmpW(fmtstr, fmt_wc) == 0) { sprintfbuf = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * 2); diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 7019321..09a0a4a 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -87,6 +87,14 @@ static void test_message_from_string_wide(void) static const WCHAR fmt_hi_crlf[] = {'h','i','\r','\n',0}; static const WCHAR fmt_cr[] = {'\r',0}; static const WCHAR fmt_crcrlf[] = {'\r','\r','\n',0}; + static const WCHAR fmt_13s[] = {'%','1','!','3','s','!',0}; + static const WCHAR fmt_1os[] = {'%','1','!','*','s','!',0}; + static const WCHAR fmt_142u[] = {'%','1','!','4','.','2','u','!',0}; + static const WCHAR fmt_1oou[] = {'%','1','!','*','.','*','u','!',0}; + static const WCHAR fmt_1oou1oou[] = {'%','1','!','*','.','*','u','!',',','%','1','!','*','.','*','u','!',0}; + static const WCHAR fmt_1oou3oou[] = {'%','1','!','*','.','*','u','!',',','%','3','!','*','.','*','u','!',0}; + static const WCHAR fmt_1oou4oou[] = {'%','1','!','*','.','*','u','!',',','%','4','!','*','.','*','u','!',0}; + static const WCHAR s_123d[] = {'1','2','3',0}; static const WCHAR s_14d[] = {' ',' ',' ','1',0}; static const WCHAR s_14x[] = {' ',' ',' ','b',0}; @@ -105,6 +113,14 @@ static void test_message_from_string_wide(void) static const WCHAR s_hi_sp[] = {'h','i',' ',0}; static const WCHAR s_sp[] = {' ',0}; static const WCHAR s_2sp[] = {' ',' ',0}; + static const WCHAR s_spt[] = {' ',' ','t',0}; + static const WCHAR s_sp3t[] = {' ',' ',' ','t',0}; + static const WCHAR s_sp03[] = {' ',' ','0','3',0}; + static const WCHAR s_sp001[] = {' ',' ','0','0','1',0}; + static const WCHAR s_sp001002[] = {' ',' ','0','0','1',',',' ','0','0','0','2',0}; + static const WCHAR s_sp001sp002[] = {' ',' ','0','0','1',',',' ',' ','0','0','0','2',0}; + static const WCHAR s_sp002sp001[] = {' ',' ','0','0','0','2',',',' ',' ','0','0','1',0}; + WCHAR out[0x100] = {0}; DWORD r, error; @@ -296,6 +312,41 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(s_crlfcrlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); + /* precision and width */ + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_13s, + 0, 0, out, sizeof(out)/sizeof(WCHAR), t ); + ok(!lstrcmpW(s_spt, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==3, "failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1os, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 4, t ); + ok(!lstrcmpW( s_sp3t, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==4,"failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_142u, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 3 ); + ok(!lstrcmpW( s_sp03, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==4,"failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1 ); + ok(!lstrcmpW( s_sp001, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==5,"failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou1oou, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1, 4, 2 ); + todo_wine ok(!lstrcmpW( s_sp001002, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==11,"failed: r=%d\n",r); + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1oou3oou, + 0, 0, out, sizeof(out)/sizeof(WCHAR), 5, 3, 1, 6, 4, 2 ); + todo_wine ok(!lstrcmpW( s_sp001sp002, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==12,"failed: r=%d\n",r); + /* args are not counted the same way with an argument array */ + { + ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, fmt_1oou4oou, + 0, 0, out, sizeof(out)/sizeof(WCHAR), (va_list *)args ); + ok(!lstrcmpW(s_sp002sp001, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==12,"failed: r=%d\n",r); + } + /* change of pace... test the low byte of dwflags */ /* line feed */ @@ -509,6 +560,41 @@ static void test_message_from_string(void) ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* precision and width */ + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!3s!", + 0, 0, out, sizeof(out), "t" ); + ok(!strcmp(" t", out),"failed out=[%s]\n",out); + ok(r==3, "failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!*s!", + 0, 0, out, sizeof(out), 4, "t"); + ok(!strcmp( " t", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!4.2u!", + 0, 0, out, sizeof(out), 3 ); + ok(!strcmp( " 03", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!*.*u!", + 0, 0, out, sizeof(out), 5, 3, 1 ); + ok(!strcmp( " 001", out),"failed out=[%s]\n",out); + ok(r==5,"failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!*.*u!,%1!*.*u!", + 0, 0, out, sizeof(out), 5, 3, 1, 4, 2 ); + todo_wine ok(!strcmp( " 001, 0002", out),"failed out=[%s]\n",out); + ok(r==11,"failed: r=%d\n",r); + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!*.*u!,%3!*.*u!", + 0, 0, out, sizeof(out), 5, 3, 1, 6, 4, 2 ); + todo_wine ok(!strcmp( " 001, 0002", out),"failed out=[%s]\n",out); + ok(r==12,"failed: r=%d\n",r); + /* args are not counted the same way with an argument array */ + { + ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, + "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (va_list *)args ); + ok(!strcmp(" 0002, 001", out),"failed out=[%s]\n",out); + ok(r==12,"failed: r=%d\n",r); + } + /* change of pace... test the low byte of dwflags */ /* line feed */

1 0

Alexandre Julliard : libwine: Fix handling of precision argument in vsnprintfW.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: eff7762d0a4d3e62ef25a7a4566a62689eebf331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff7762d0a4d3e62ef25a7a45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 13:05:37 2009 +0100 libwine: Fix handling of precision argument in vsnprintfW. --- libs/wine/string.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index 3c41019..6afb899 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -406,6 +406,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) sprintf(buffiter, "%d", fieldlen); while (*buffiter) *fmta++ = *buffiter++; + iter++; } else while (isdigit(*iter))

1 0

Paul Vriens : comctl32/tests: Use A-functions.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 9bd6887372c1a6b72f0fe784f99da72005b64e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd6887372c1a6b72f0fe784f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 28 14:57:22 2009 +0100 comctl32/tests: Use A-functions. --- dlls/comctl32/tests/propsheet.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index a61fa0b..111482e 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -92,7 +92,7 @@ static void test_title(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = 0; - psp.hInstance = GetModuleHandleW(NULL); + psp.hInstance = GetModuleHandleA(NULL); U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = page_dlg_proc; @@ -123,7 +123,7 @@ static void test_nopage(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = 0; - psp.hInstance = GetModuleHandleW(NULL); + psp.hInstance = GetModuleHandleA(NULL); U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = page_dlg_proc; @@ -190,7 +190,7 @@ static void test_disableowner(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = 0; - psp.hInstance = GetModuleHandleW(NULL); + psp.hInstance = GetModuleHandleA(NULL); U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = NULL; @@ -251,25 +251,25 @@ static void test_wiznavigation(void) memset(psp, 0, sizeof(PROPSHEETPAGEA) * 4); psp[0].dwSize = sizeof(PROPSHEETPAGEA); - psp[0].hInstance = GetModuleHandleW(NULL); + psp[0].hInstance = GetModuleHandleA(NULL); U(psp[0]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_INTRO); psp[0].pfnDlgProc = nav_page_proc; hpsp[0] = CreatePropertySheetPageA(&psp[0]); psp[1].dwSize = sizeof(PROPSHEETPAGEA); - psp[1].hInstance = GetModuleHandleW(NULL); + psp[1].hInstance = GetModuleHandleA(NULL); U(psp[1]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_EDIT); psp[1].pfnDlgProc = nav_page_proc; hpsp[1] = CreatePropertySheetPageA(&psp[1]); psp[2].dwSize = sizeof(PROPSHEETPAGEA); - psp[2].hInstance = GetModuleHandleW(NULL); + psp[2].hInstance = GetModuleHandleA(NULL); U(psp[2]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_RADIO); psp[2].pfnDlgProc = nav_page_proc; hpsp[2] = CreatePropertySheetPageA(&psp[2]); psp[3].dwSize = sizeof(PROPSHEETPAGEA); - psp[3].hInstance = GetModuleHandleW(NULL); + psp[3].hInstance = GetModuleHandleA(NULL); U(psp[3]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_EXIT); psp[3].pfnDlgProc = nav_page_proc; hpsp[3] = CreatePropertySheetPageA(&psp[3]); @@ -363,7 +363,7 @@ static void test_buttons(void) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); psp.dwFlags = 0; - psp.hInstance = GetModuleHandleW(NULL); + psp.hInstance = GetModuleHandleA(NULL); U(psp).pszTemplate = "prop_page1"; U2(psp).pszIcon = NULL; psp.pfnDlgProc = page_dlg_proc;

1 0

Huw Davies : include: Add rstloc.idl.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 4eeee2909a22f845ac10f8fcb844f7f86c8484bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eeee2909a22f845ac10f8fcb… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 13:18:54 2009 +0000 include: Add rstloc.idl. --- include/Makefile.in | 1 + include/oledb.idl | 3 ++ include/rstloc.idl | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 72 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 66d8c0d..f8fbfc9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -404,6 +404,7 @@ SRCDIR_INCLUDES = \ rpcproxy.h \ rstbas.idl \ rstinf.idl \ + rstloc.idl \ rtutils.h \ scarderr.h \ schannel.h \ diff --git a/include/oledb.idl b/include/oledb.idl index a1b4643..3f524eb 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -34,16 +34,19 @@ typedef LONG DBROWCOUNT; typedef ULONG DBCOUNTITEM; typedef ULONG DBLENGTH; typedef ULONG DBORDINAL; +typedef ULONG DBBKMARK; typedef DWORD DB_DWRESERVE; typedef ULONG DBREFCOUNT; typedef ULONG DB_UPARAMS; typedef LONG DB_LPARAMS; +typedef DWORD DBHASHVALUE; #include "dbs.idl" #include "access.idl" #include "rstbas.idl" #include "rstinf.idl" +#include "rstloc.idl" #include "cmdbas.idl" #include "cmdtxt.idl" #include "dbccmd.idl" diff --git a/include/rstloc.idl b/include/rstloc.idl new file mode 100644 index 0000000..266aabf --- /dev/null +++ b/include/rstloc.idl @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * 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 + */ + +[ + local, + object, + uuid(0c733a7d-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetLocate : IRowset +{ + typedef DWORD DBCOMPARE; + + enum DBCOMPAREENUM + { + DBCOMPARE_LT, + DBCOMPARE_EQ, + DBCOMPARE_GT, + DBCOMPARE_NE, + DBCOMPARE_NOTCOMPARABLE + }; + + HRESULT Compare([in] HCHAPTER hReserved, + [in] DBBKMARK cbBookmark1, + [in, size_is(cbBookmark1)] const BYTE *pBookmark1, + [in] DBBKMARK cbBookmark2, + [in, size_is(cbBookmark2)] const BYTE *pBookmark2, + [out] DBCOMPARE *pComparison); + + HRESULT GetRowsAt([in] HWATCHREGION hReserved1, + [in] HCHAPTER hReserved2, + [in] DBBKMARK cbBookmark, + [in, size_is(cbBookmark)] const BYTE *pBookmark, + [in] DBROWOFFSET lRowsOffset, + [in] DBROWCOUNT cRows, + [out] DBCOUNTITEM *pcRowsObtained, + [out, size_is(,cRows)] HROW **prghRows); + + HRESULT GetRowsByBookmark([in] HCHAPTER hReserved, + [in] DBCOUNTITEM cRows, + [in, size_is(cRows)] const DBBKMARK rgcbBookmarks[], + [in, size_is(cRows)] const BYTE *rgpBookmarks[], + [out, size_is(cRows)] HROW rghRows[], + [out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); + + HRESULT Hash([in] HCHAPTER hReserved, + [in] DBBKMARK cBookmarks, + [in, size_is(cBookmarks)] const DBBKMARK rgcbBookmarks[], + [in, size_is(cBookmarks)] const BYTE *rgpBookmarks[], + [out, size_is(cBookmarks)] DBHASHVALUE rgHashedValues[], + [out, size_is(cBookmarks)] DBROWSTATUS rgBookmarkStatus[]); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index dadb393..28c1e1c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -127,6 +127,7 @@ my %private_idl_headers = ( "opnrst.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, + "rstloc.idl" => 1, "sesprp.idl" => 1, "vmrender.idl" => 1, "wine/wined3d.idl" => 1,

1 0

Huw Davies : include: Add rstbas.idl.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 6454c5df7b5097f403f98387dd62e94faa13a6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6454c5df7b5097f403f98387d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 13:08:02 2009 +0000 include: Add rstbas.idl. --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/rstbas.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index f799f45..66d8c0d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -402,6 +402,7 @@ SRCDIR_INCLUDES = \ rpcndr.h \ rpcnterr.h \ rpcproxy.h \ + rstbas.idl \ rstinf.idl \ rtutils.h \ scarderr.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 3ef9241..a1b4643 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -42,6 +42,7 @@ typedef LONG DB_LPARAMS; #include "dbs.idl" #include "access.idl" +#include "rstbas.idl" #include "rstinf.idl" #include "cmdbas.idl" #include "cmdtxt.idl" diff --git a/include/rstbas.idl b/include/rstbas.idl new file mode 100644 index 0000000..94d23f1 --- /dev/null +++ b/include/rstbas.idl @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * 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 + */ + +[ + local, + object, + uuid(0c733a7c-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowset : IUnknown +{ + typedef DWORD DBROWOPTIONS; + + HRESULT AddRefRows([in] DBCOUNTITEM cRows, + [in, size_is(cRows)] const HROW rghRows[], + [out, size_is(cRows)] DBREFCOUNT rgRefCounts[], + [out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); + + HRESULT GetData([in] HROW hRow, + [in] HACCESSOR hAccessor, + [out] void *pData); + + HRESULT GetNextRows([in] HCHAPTER hReserved, + [in] DBROWOFFSET lRowsOffset, + [in] DBROWCOUNT cRows, + [out] DBCOUNTITEM *pcRowObtained, + [out, size_is(,cRows)] HROW **prghRows); + + HRESULT ReleaseRows([in] DBCOUNTITEM cRows, + [in, size_is(cRows)] const HROW rghRows[], + [in, size_is(cRows)] DBROWOPTIONS rgRowOptions[], + [out, size_is(cRows)] DBREFCOUNT rgRefCounts[], + [out, size_is(cRows)] DBROWSTATUS rgRowStatus[]); + + HRESULT RestartPosition([in] HCHAPTER hReserved); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index fbf3150..dadb393 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -125,6 +125,7 @@ my %private_idl_headers = ( "devenum.idl" => 1, "dyngraph.idl" => 1, "opnrst.idl" => 1, + "rstbas.idl" => 1, "rstinf.idl" => 1, "sesprp.idl" => 1, "vmrender.idl" => 1,

1 0

Paul Bolle : dbghelp: elf_load_file: return if elf_map_file fails.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 4c97910387cc72bc1e7e600fc71aa8b285dae31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c97910387cc72bc1e7e600fc… Author: Paul Bolle <pebolle(a)tiscali.nl> Date: Wed Oct 28 13:47:15 2009 +0100 dbghelp: elf_load_file: return if elf_map_file fails. --- dlls/dbghelp/elf_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 6c79c8b..34d4560 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1063,7 +1063,7 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); - if (!elf_map_file(filename, &fmap)) goto leave; + if (!elf_map_file(filename, &fmap)) return ret; /* Next, we need to find a few of the internal ELF headers within * this thing. We need the main executable header, and the section

1 0

Huw Davies : oledb32: Add some conversions to DBTYPE_UI8.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: b3cdc6d7c85d0866902edb1f25ad7531fcc0988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cdc6d7c85d0866902edb1f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:17:53 2009 +0000 oledb32: Add some conversions to DBTYPE_UI8. --- dlls/oledb32/convert.c | 26 ++++++++++++++++++ dlls/oledb32/tests/convert.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 7992819..27ff585 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -392,6 +392,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_UI8: + { + ULONGLONG *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarUI8FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: {LONGLONG s = *(signed int*)src; hr = VarUI8FromI8(s, d); break;} + case DBTYPE_R4: hr = VarUI8FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarUI8FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarUI8FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarUI8FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarUI8FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarUI8FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarUI8FromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarUI8FromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: hr = VarUI8FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarUI8FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarUI8FromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarUI8FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: *d = *(ULONGLONG*)src; hr = S_OK; break; + default: FIXME("Unimplemented conversion %04x -> UI8\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_FILETIME: { FILETIME *d = dst; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 7290a9d..07b2d84 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1388,6 +1388,64 @@ static void test_converttocy(void) IDataConvert_Release(convert); } +static void test_converttoui8(void) +{ + IDataConvert *convert; + HRESULT hr; + ULARGE_INTEGER dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + + 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; + } + + dst.QuadPart = 0xcc; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_UI8, 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.QuadPart == 0, "got %d\n", (int)dst.QuadPart); + + dst.QuadPart = 0xcc; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_UI8, 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.QuadPart == 0xcc, "dst changed\n"); + + dst.QuadPart = 0xcc; + *(int*)src = 1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_UI8, 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.QuadPart == 1234, "got %d\n", (int)dst.QuadPart); + + dst.QuadPart = 0xcc; + *(int*)src = -1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_UI8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); +todo_wine + ok(dst_status == DBSTATUS_E_SIGNMISMATCH, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %d\n", dst_len); + ok(dst.QuadPart == 0xcc, "got %d\n", (int)dst.QuadPart); + + dst.QuadPart = 0xcc; + ((ULARGE_INTEGER*)src)->QuadPart = 1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_UI8, 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.QuadPart == 1234, "got %d\n", (int)dst.QuadPart); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -1404,5 +1462,6 @@ START_TEST(convert) test_converttor4(); test_converttofiletime(); test_converttocy(); + test_converttoui8(); OleUninitialize(); }

1 0

Huw Davies : oledb32: Add some conversions to DBTYPE_CY.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 21bbdb7157fabd5313abeb964b807d95582b0df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bbdb7157fabd5313abeb964… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:13:20 2009 +0000 oledb32: Add some conversions to DBTYPE_CY. --- dlls/oledb32/convert.c | 28 +++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 6f2ddd4..7992819 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -127,6 +127,8 @@ static int get_length(DBTYPE type) case DBTYPE_I8: case DBTYPE_UI8: return 8; + case DBTYPE_CY: + return sizeof(CY); case DBTYPE_BSTR: return sizeof(BSTR); case DBTYPE_FILETIME: @@ -286,6 +288,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } + case DBTYPE_CY: + { + CY *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: d->int64 = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarCyFromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarCyFromI4(*(signed int*)src, d); break; + case DBTYPE_R4: hr = VarCyFromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarCyFromR8(*(double*)src, d); break; + case DBTYPE_CY: *d = *(CY*)src; hr = S_OK; break; + case DBTYPE_DATE: hr = VarCyFromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarCyFromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarCyFromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarCyFromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarCyFromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: hr = VarCyFromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarCyFromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarCyFromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarCyFromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarCyFromUI8(*(ULONGLONG*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> CY\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_BSTR: { BSTR *d = dst; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 7166cfb..7290a9d 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1339,6 +1339,55 @@ static void test_converttor4(void) IDataConvert_Release(convert); } +static void test_converttocy(void) +{ + IDataConvert *convert; + HRESULT hr; + CY dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + + 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; + } + + dst.int64 = 0xcc; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_CY, 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(CY), "got %d\n", dst_len); + ok(dst.int64 == 0, "didn't get 0\n"); + + dst.int64 = 0xcc; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_CY, 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(CY), "got %d\n", dst_len); + ok(dst.int64 == 0xcc, "dst changed\n"); + + dst.int64 = 0xcc; + *(int*)src = 1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_CY, 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(CY), "got %d\n", dst_len); + ok(dst.int64 == 12340000, "got %d\n", dst.s.Lo); + + dst.int64 = 0xcc; + ((CY*)src)->int64 = 1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_CY, 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(CY), "got %d\n", dst_len); + ok(dst.int64 == 1234, "got %d\n", dst.s.Lo); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -1354,5 +1403,6 @@ START_TEST(convert) test_converttoui4(); test_converttor4(); test_converttofiletime(); + test_converttocy(); OleUninitialize(); }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
121
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 October 2009