wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Christian Costa : d3dxof: Cleanup separators handling and allow multi-semicolons + single comma separator .
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: e7c3b03531a9642cb8cce81322906c0281fa5928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c3b03531a9642cb8cce8132… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 21 20:02:03 2013 +0200 d3dxof: Cleanup separators handling and allow multi-semicolons + single comma separator. --- dlls/d3dxof/parsing.c | 42 ++++++++++++++++-------------------------- dlls/d3dxof/tests/d3dxof.c | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 37cf2e1..2faf7a2 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1141,6 +1141,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) { ULONG k; ULONG nb_elems = 1; + BOOL basic_type = TRUE; buf->pxo->members[i].name = pt->members[i].name; buf->pxo->members[i].start = buf->cur_pos_data; @@ -1157,26 +1158,12 @@ static BOOL parse_object_members_list(parse_buffer * buf) for (k = 0; k < nb_elems; k++) { - if (buf->txt && k) - { - token = check_TOKEN(buf); - if (token == TOKEN_COMMA) - { - get_TOKEN(buf); - } - else - { - /* Allow comma omission */ - if (!((token == TOKEN_FLOAT) || (token == TOKEN_INTEGER))) - return FALSE; - } - } - if (pt->members[i].type == TOKEN_NAME) { ULONG j; TRACE("Found sub-object %s\n", buf->pdxf->xtemplates[pt->members[i].idx_template].name); + basic_type = FALSE; buf->level++; /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) @@ -1270,23 +1257,26 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } else - { + { FIXME("Unexpected token %d\n", token); return FALSE; } } - } - - /* Empty arrays can have the semicolon at the end or not so remove it if any and skip next check */ - if (!nb_elems && (check_TOKEN(buf) == TOKEN_SEMICOLON)) - get_TOKEN(buf); - if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) - { - token = get_TOKEN(buf); - if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) - return FALSE; + if (basic_type) + { + /* Handle separator only for basic types */ + token = check_TOKEN(buf); + if ((token != TOKEN_COMMA) && (token != TOKEN_SEMICOLON)) + return FALSE; + /* Allow multi-semicolons + single comma separator */ + while (check_TOKEN(buf) == TOKEN_SEMICOLON) + get_TOKEN(buf); + if (check_TOKEN(buf) == TOKEN_COMMA) + get_TOKEN(buf); + } } + buf->pxo->members[i].size = buf->cur_pos_data - buf->pxo->members[i].start; } diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 52012d7..ecd4ba5 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -865,24 +865,24 @@ static void test_syntax_semicolon_comma(void) /* Test semicolon separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_semicolon_txt, sizeof(object_syntax_semicolon_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test semicolon separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_semicolon_bin, sizeof(object_syntax_semicolon_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_comma_txt, sizeof(object_syntax_comma_txt) - 1); ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_comma_bin, sizeof(object_syntax_comma_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_bin, sizeof(object_syntax_multi_semicolons_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-commas separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_commas_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); @@ -893,10 +893,10 @@ static void test_syntax_semicolon_comma(void) /* Test multi-semicolons + single comma separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_txt, sizeof(object_syntax_multi_semicolons_and_comma_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons + single comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_bin, sizeof(object_syntax_multi_semicolons_and_comma_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma + semicolon separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_comma_and_semicolon_txt, sizeof(object_syntax_comma_and_semicolon_txt) - 1); @@ -907,14 +907,14 @@ static void test_syntax_semicolon_comma(void) /* Test no ending separator in text mode */ ret = test_buffer_object(dxfile, object_syntax_no_ending_separator_txt, sizeof(object_syntax_no_ending_separator_txt) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no ending separator in binary mode */ ret = test_buffer_object(dxfile, object_syntax_no_ending_separator_bin, sizeof(object_syntax_no_ending_separator_bin)); ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no array separator in text mode */ ret = test_buffer_object(dxfile, object_syntax_array_no_separator_txt, sizeof(object_syntax_array_no_separator_txt) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no array separator in binary mode */ ret = test_buffer_object(dxfile, object_syntax_array_no_separator_bin, sizeof(object_syntax_array_no_separator_bin)); ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); @@ -925,11 +925,11 @@ static void test_syntax_semicolon_comma(void) /* Test object with mixed integer list and integers + single comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_mixed_integer_list_bin, sizeof(object_syntax_mixed_integer_list_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test integer list followed by a semicolon in binary mode */ ret = test_buffer_object(dxfile, object_syntax_integer_list_semicolon_bin, sizeof(object_syntax_integer_list_semicolon_bin)); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test integer list followed by a comma in binary mode */ ret = test_buffer_object(dxfile, object_syntax_integer_list_comma_bin, sizeof(object_syntax_integer_list_comma_bin));

1 0

Hans Leidekker : wbemprox: Avoid storing rows that don' t match the query condition.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 90e913c42fd4c82b7344e1ffefe5892c6d642d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e913c42fd4c82b7344e1ffe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 22 10:10:16 2013 +0200 wbemprox: Avoid storing rows that don't match the query condition. --- dlls/wbemprox/builtin.c | 164 +++++++++++++++++++++++++++----------- dlls/wbemprox/table.c | 35 ++++---- dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 135 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90e913c42fd4c82b7344e…

1 0

Hans Leidekker : wbemprox: Return a status from table fillers and add an optional condition parameter .
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: aca407bfe799becf29e6cc5f615dcf990ed6d606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca407bfe799becf29e6cc5f6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 22 10:09:26 2013 +0200 wbemprox: Return a status from table fillers and add an optional condition parameter. --- dlls/wbemprox/builtin.c | 66 +++++++++++++++--------- dlls/wbemprox/query.c | 7 +-- dlls/wbemprox/table.c | 3 +- dlls/wbemprox/wbemprox_private.h | 104 ++++++++++++++++++++----------------- 4 files changed, 100 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aca407bfe799becf29e6c…

1 0

Hans Leidekker : wbemprox: Refill tables with dynamic content before each query.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 8f69a44b1c7e8fa6efc9d5e74ccf8af385675abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f69a44b1c7e8fa6efc9d5e74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 22 10:08:17 2013 +0200 wbemprox: Refill tables with dynamic content before each query. --- dlls/wbemprox/query.c | 6 +++++- dlls/wbemprox/table.c | 2 +- dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 8ac42cc..fa03fcf 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -246,7 +246,11 @@ static HRESULT execute_view( struct view *view ) UINT i, j = 0, len; if (!view->table) return S_OK; - if (view->table->fill && !view->table->data) view->table->fill( view->table ); + if (view->table->fill) + { + clear_table( view->table ); + view->table->fill( view->table ); + } if (!view->table->num_rows) return S_OK; len = min( view->table->num_rows, 16 ); diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 126dc0a..70ea98e 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -263,7 +263,7 @@ HRESULT get_method( const struct table *table, const WCHAR *name, class_method * } -static void clear_table( struct table *table ) +void clear_table( struct table *table ) { UINT i, j, type; LONGLONG val; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index efdde76..a4d034d 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -171,6 +171,7 @@ struct table *create_table( const WCHAR *, UINT, const struct column *, UINT, BYTE *, void (*)(struct table *)) DECLSPEC_HIDDEN; BOOL add_table( struct table * ) DECLSPEC_HIDDEN; void free_columns( struct column *, UINT ) DECLSPEC_HIDDEN; +void clear_table( struct table * ) DECLSPEC_HIDDEN; void free_table( struct table * ) DECLSPEC_HIDDEN; UINT get_type_size( CIMTYPE ) DECLSPEC_HIDDEN; HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Fill tables at latest possible moment.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 6253d49e152101282d04dea6ef66c8525f3489b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6253d49e152101282d04dea6e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 22 10:07:26 2013 +0200 wbemprox: Fill tables at latest possible moment. --- dlls/wbemprox/query.c | 4 +++- dlls/wbemprox/table.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1850368..8ac42cc 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -245,7 +245,9 @@ static HRESULT execute_view( struct view *view ) { UINT i, j = 0, len; - if (!view->table || !view->table->num_rows) return S_OK; + if (!view->table) return S_OK; + if (view->table->fill && !view->table->data) view->table->fill( view->table ); + if (!view->table->num_rows) return S_OK; len = min( view->table->num_rows, 16 ); if (!(view->result = heap_alloc( len * sizeof(UINT) ))) return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index c114e53..126dc0a 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -336,7 +336,6 @@ struct table *grab_table( const WCHAR *name ) { if (!strcmpiW( table->name, name )) { - if (table->fill && !table->data) table->fill( table ); TRACE("returning %p\n", table); return addref_table( table ); }

1 0

Hans Leidekker : wbemprox: Implement Win32_Process.Name.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: d030b819c1f2971d45e9b110cf67b2ad89194f8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d030b819c1f2971d45e9b110c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 22 10:06:35 2013 +0200 wbemprox: Implement Win32_Process.Name. --- dlls/wbemprox/builtin.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e5a4e37..a0dac2e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -static const WCHAR class_logicaldisk2W[] = - {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_baseboardW[] = {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; static const WCHAR class_biosW[] = @@ -59,6 +57,8 @@ static const WCHAR class_diskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_logicaldiskW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; +static const WCHAR class_logicaldisk2W[] = + {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; static const WCHAR class_osW[] = @@ -328,6 +328,7 @@ static const struct column col_process[] = { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_pprocessidW, CIM_UINT32, VT_I4 }, { prop_processidW, CIM_UINT32, VT_I4 }, { prop_threadcountW, CIM_UINT32, VT_I4 }, @@ -558,6 +559,7 @@ struct record_process const WCHAR *commandline; const WCHAR *description; const WCHAR *handle; + const WCHAR *name; UINT32 pprocess_id; UINT32 process_id; UINT32 thread_count; @@ -1040,6 +1042,7 @@ static void fill_process( struct table *table ) rec->description = heap_strdupW( entry.szExeFile ); sprintfW( handle, fmtW, entry.th32ProcessID ); rec->handle = heap_strdupW( handle ); + rec->name = heap_strdupW( entry.szExeFile ); rec->process_id = entry.th32ProcessID; rec->pprocess_id = entry.th32ParentProcessID; rec->thread_count = entry.cntThreads; @@ -1449,8 +1452,8 @@ static struct table builtin_classes[] = { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), (BYTE *)data_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, NULL, fill_diskpartition }, - { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, + { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), (BYTE *)data_param },

1 0

Alistair Leslie-Hughes : include: Add DB_E_CONCURRENCYVIOLATION define.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 1bf2cf3cd8909f32ae322ef35432eee17d1daf6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf2cf3cd8909f32ae322ef35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 20 10:57:11 2013 +1000 include: Add DB_E_CONCURRENCYVIOLATION define. --- include/oledberr.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/oledberr.h b/include/oledberr.h index c2033b6..b91b429 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -33,6 +33,8 @@ #define DB_E_BADCOMPAREOP 0x80040e27 #define DB_E_BADSTATUSVALUE 0x80040e28 +#define DB_E_CONCURRENCYVIOLATION 0x80040e38 + #define DB_E_DATAOVERFLOW 0x80040e57 #define DB_E_MISMATCHEDPROVIDER 0x80040e75

1 0

Alistair Leslie-Hughes : oledb32: Source status DBSTATUS_S_ISNULL applies to all conversions.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 7dfa56886f9e64ec719e61ca761b113413042d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfa56886f9e64ec719e61ca7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 21 13:43:42 2013 +1000 oledb32: Source status DBSTATUS_S_ISNULL applies to all conversions. --- dlls/oledb32/convert.c | 14 +++++++------- dlls/oledb32/tests/convert.c | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 4bf2b85..ab188ee 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -184,6 +184,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return DB_E_UNSUPPORTEDCONVERSION; } + if(src_status == DBSTATUS_S_ISNULL) + { + *dst_status = DBSTATUS_S_ISNULL; + *dst_len = 0; + return S_OK; + } + if(src_type == DBTYPE_STR) { BSTR b; @@ -805,13 +812,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, { VARIANT *v = dst; - if(src_status == DBSTATUS_S_ISNULL) - { - *dst_status = DBSTATUS_S_ISNULL; - *dst_len = 0; - return S_OK; - } - switch(src_type) { case DBTYPE_BOOL: diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 305433a..92d3a64 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -884,6 +884,14 @@ todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(i4), "got %ld\n", dst_len); ok(i4 == 10, "got %08x\n", i4); + + /* src_status = DBSTATUS_S_ISNULL */ + i4 = 0x12345678; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), DBSTATUS_S_ISNULL, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); + } static void test_converttoi8(void)

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_VARIANT( V_DATE)->DBTYPE_DBDATE.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 24e56beec0cee65b22a674115ab11598d0c482f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e56beec0cee65b22a674115… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 20 16:29:22 2013 +1000 oledb32: Implement DataConvert DBTYPE_VARIANT(V_DATE)->DBTYPE_DBDATE. --- dlls/oledb32/convert.c | 22 +++++++++++++++++++--- dlls/oledb32/tests/convert.c | 10 ++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index fe7ba8c..4bf2b85 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -421,6 +421,21 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, switch (src_type) { case DBTYPE_DBDATE: memcpy(d, src, sizeof(DBDATE)); hr = S_OK; break; + case DBTYPE_VARIANT: + if( V_VT((VARIANT*)src) == VT_DATE) + { + SYSTEMTIME st; + hr = (VariantTimeToSystemTime( V_DATE((VARIANT*)src), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + } + else + { + FIXME("Unimplemented variant type %d -> DBDATE\n", V_VT((VARIANT*)src)); + return E_NOTIMPL; + } + break; default: FIXME("Unimplemented conversion %04x -> DBDATE\n", src_type); return E_NOTIMPL; } break; @@ -446,7 +461,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, break; } case DBTYPE_VARIANT: - { if( V_VT((VARIANT*)src) == VT_DATE) { SYSTEMTIME st; @@ -458,11 +472,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->minute = st.wMinute; d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; - break; } else + { FIXME("Unimplemented variant type %d -> DBTIMESTAMP\n", V_VT((VARIANT*)src)); - } + return E_NOTIMPL; + } + break; default: FIXME("Unimplemented conversion %04x -> DBTIMESTAMP\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 68df732..305433a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2462,6 +2462,7 @@ static void test_converttodbdate(void) DBDATE ts = {2013, 5, 14}; DBDATE dst; DBSTATUS dst_status; + VARIANT var; dst_len = 0; hr = IDataConvert_DataConvert(convert, DBTYPE_DBDATE, DBTYPE_DBDATE, sizeof(ts), &dst_len, &ts, &dst, 2, 0, &dst_status, 0, 0, 0); @@ -2470,6 +2471,15 @@ static void test_converttodbdate(void) ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + VariantInit(&var); + V_VT(&var) = VT_DATE; + V_DATE(&var) = 41408.086250; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 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(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); }

1 0

Frédéric Delanoy : vbscript: Fix typo.
by Alexandre Julliard 22 May '13

22 May '13

Module: wine Branch: master Commit: 4bd398120424a9e84f6defaa4bf743586999f809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd398120424a9e84f6defaa4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue May 21 22:53:46 2013 +0200 vbscript: Fix typo. --- dlls/vbscript/global.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fbd8601..c142d10 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -429,7 +429,7 @@ static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR val = V_R8(arg) > 0.0 || V_R8(arg) < 0.0; break; default: - ERR("Not a numeric vaule: %s\n", debugstr_variant(arg)); + ERR("Not a numeric value: %s\n", debugstr_variant(arg)); return E_FAIL; }

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
50
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 May 2013