wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Sebastian Lackner : kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 1bebee9c1b119d727991aee50451e36e0865f927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bebee9c1b119d727991aee50… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:24:06 2016 +0100 kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4a9e540..6726fb9 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1798,6 +1798,36 @@ static void test_CompareStringA(void) "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); } +static void test_CompareStringW(void) +{ + WCHAR *str1, *str2; + SYSTEM_INFO si; + DWORD old_prot; + BOOL success; + char *buf; + int ret; + + GetSystemInfo(&si); + buf = VirtualAlloc(NULL, si.dwPageSize * 4, MEM_COMMIT, PAGE_READWRITE); + ok(buf != NULL, "VirtualAlloc failed with %u\n", GetLastError()); + success = VirtualProtect(buf + si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + success = VirtualProtect(buf + 3 * si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + + str1 = (WCHAR *)(buf + si.dwPageSize - sizeof(WCHAR)); + str2 = (WCHAR *)(buf + 3 * si.dwPageSize - sizeof(WCHAR)); + *str1 = 'A'; + *str2 = 'B'; + + /* CompareStringW should abort on the first non-matching character */ + ret = CompareStringW(CP_ACP, 0, str1, 100, str2, 100); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + + success = VirtualFree(buf, 0, MEM_RELEASE); + ok(success, "VirtualFree failed with %u\n", GetLastError()); +} + struct comparestringex_test { const char *locale; DWORD flags; @@ -4791,6 +4821,7 @@ START_TEST(locale) test_GetCurrencyFormatA(); /* Also tests the W version */ test_GetNumberFormatA(); /* Also tests the W version */ test_CompareStringA(); + test_CompareStringW(); test_CompareStringEx(); test_LCMapStringA(); test_LCMapStringW();

1 0

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 26d0a0a081ae71048b5932c3972bd62d7149af1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d0a0a081ae71048b5932c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 13 13:32:28 2016 +0900 opengl32: Update to the current OpenGL spec. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/opengl_ext.c | 325 +- dlls/opengl32/opengl_norm.c | 92 +- include/wine/wgl.h | 11118 +++++++++++++++++++++--------------------- include/wine/wgl_driver.h | 49 +- 5 files changed, 6063 insertions(+), 5522 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26d0a0a081ae71048b593…

1 0

Sebastian Lackner : opengl32: Ensure extension tables generated by make_opengl contain earliest GL_VERSION for each function.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 68867e30b2ff33ea04d1b6150b4cc76a72976916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68867e30b2ff33ea04d1b6150… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 00:21:03 2016 +0100 opengl32: Ensure extension tables generated by make_opengl contain earliest GL_VERSION for each function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 2b15f58..ec782ed 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -692,12 +692,14 @@ sub parse_file($$) } # generate extension functions from norm functions, if they are newer than the category - while (my ($k, $v) = each(%{$data->{feature}})) { + my %features = %{$data->{feature}}; + foreach (sort keys %features) { + my ($k, $v) = %features{$_}; if (!$norm_categories{$k} && $v->{api} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { for (keys %{$req->{command}}) { - if (!$norm_functions{$_}) { + if (!$ext_functions{$_} && !$norm_functions{$_}) { $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; } }

1 0

Aric Stewart : usp10: Handle GSUB SubType 7: Extension Substitution.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 12fb74ac565fc2b8f7f79c3706106b560197e0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=12fb74ac565fc2b8f7f79c370… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 12 11:24:05 2016 -0600 usp10: Handle GSUB SubType 7: Extension Substitution. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 73 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e7f2dfd..5b39663 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -277,6 +277,12 @@ typedef struct{ WORD Alternate[1]; } GSUB_AlternateSet; +typedef struct { + WORD SubstFormat; + WORD ExtensionLookupType; + DWORD ExtensionOffset; +} GSUB_ExtensionPosFormat1; + /* These are all structures needed for the GPOS table */ typedef struct { @@ -725,6 +731,25 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return -1; } +static const BYTE *GSUB_get_subtable(const OT_LookupTable *look, int index) +{ + int offset = GET_BE_WORD(look->SubTable[index]); + + if (GET_BE_WORD(look->LookupType) == 7) + { + const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)look + offset); + if (GET_BE_WORD(ext->SubstFormat) == 1) + { + offset += GET_BE_DWORD(ext->ExtensionOffset); + } + else + { + FIXME("Unhandled Extension Substitution Format %i\n",GET_BE_WORD(ext->SubstFormat)); + } + } + return (const BYTE *)look + offset; +} + static INT GSUB_apply_SingleSubst(const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -732,10 +757,7 @@ static INT GSUB_apply_SingleSubst(const OT_LookupTable *look, WORD *glyphs, INT for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GSUB_SingleSubstFormat1 *ssf1; - offset = GET_BE_WORD(look->SubTable[j]); - ssf1 = (const GSUB_SingleSubstFormat1*)((const BYTE*)look+offset); + const GSUB_SingleSubstFormat1 *ssf1 = (const GSUB_SingleSubstFormat1*)GSUB_get_subtable(look, j); if (GET_BE_WORD(ssf1->SubstFormat) == 1) { int offset = GET_BE_WORD(ssf1->Coverage); @@ -783,8 +805,7 @@ static INT GSUB_apply_MultipleSubst(const OT_LookupTable *look, WORD *glyphs, IN { int offset, index; const GSUB_MultipleSubstFormat1 *msf1; - offset = GET_BE_WORD(look->SubTable[j]); - msf1 = (const GSUB_MultipleSubstFormat1*)((const BYTE*)look+offset); + msf1 = (const GSUB_MultipleSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(msf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)msf1+offset, glyphs[glyph_index]); @@ -833,8 +854,7 @@ static INT GSUB_apply_AlternateSubst(const OT_LookupTable *look, WORD *glyphs, I const GSUB_AlternateSubstFormat1 *asf1; INT index; - offset = GET_BE_WORD(look->SubTable[j]); - asf1 = (const GSUB_AlternateSubstFormat1*)((const BYTE*)look+offset); + asf1 = (const GSUB_AlternateSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(asf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)asf1+offset, glyphs[glyph_index]); @@ -866,8 +886,7 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN const GSUB_LigatureSubstFormat1 *lsf1; int offset,index; - offset = GET_BE_WORD(look->SubTable[j]); - lsf1 = (const GSUB_LigatureSubstFormat1*)((const BYTE*)look+offset); + lsf1 = (const GSUB_LigatureSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(lsf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)lsf1+offset, glyphs[glyph_index]); TRACE(" Coverage index %i\n",index); @@ -933,8 +952,7 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo int dirLookahead = write_dir; int dirBacktrack = -1 * write_dir; - offset = GET_BE_WORD(look->SubTable[j]); - ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset); + ccsf1 = (const GSUB_ChainContextSubstFormat1*)GSUB_get_subtable(look, j); if (GET_BE_WORD(ccsf1->SubstFormat) == 1) { static int once; @@ -1029,12 +1047,34 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int offset; + int type; const OT_LookupTable *look; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); - TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - switch(GET_BE_WORD(look->LookupType)) + type = GET_BE_WORD(look->LookupType); + TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + if (type == 7) + { + if (GET_BE_WORD(look->SubTableCount)) + { + const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)look + GET_BE_WORD(look->SubTable[0])); + if (GET_BE_WORD(ext->SubstFormat) == 1) + { + type = GET_BE_WORD(ext->ExtensionLookupType); + TRACE("extension type %i\n",type); + } + else + { + FIXME("Unhandled Extension Substitution Format %i\n",GET_BE_WORD(ext->SubstFormat)); + } + } + else + { + WARN("lookup type is Extension Substitution but no extension subtable exists\n"); + } + } + switch(type) { case 1: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); @@ -1046,8 +1086,11 @@ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 6: return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); + case 7: + FIXME("Extension Substitution types not valid here\n"); + break; default: - FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); + FIXME("We do not handle SubType %i\n",type); } return GSUB_E_NOGLYPH; }

1 0

Henri Verbeet : ddraw: Disable WINED3D_SRGB_READ_WRITE_CONTROL.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: c6a72849245bdb9b824b8336a8c46bd1444488a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a72849245bdb9b824b8336a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:23 2016 +0100 ddraw: Disable WINED3D_SRGB_READ_WRITE_CONTROL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2e7624b..26bc242 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -60,8 +60,7 @@ struct FvfToDecl #define DDRAW_STRIDE_ALIGNMENT 8 #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ - | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ - | WINED3D_SRGB_READ_WRITE_CONTROL) + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER) enum ddraw_device_state {

1 0

Henri Verbeet : d3d8: Disable WINED3D_SRGB_READ_WRITE_CONTROL.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 5647fffb83ea8b6ef5d63a4528128085deb54cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5647fffb83ea8b6ef5d63a452… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:22 2016 +0100 d3d8: Disable WINED3D_SRGB_READ_WRITE_CONTROL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 863e596..a64790b 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -438,8 +438,7 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING - | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_SRGB_READ_WRITE_CONTROL; + | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1;

1 0

Henri Verbeet : wined3d: Use a wined3d_string_buffer to dump the intermediate shader code.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: e5719e9899ea5bd421b8f019e5c11b972e3900cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5719e9899ea5bd421b8f019e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:21 2016 +0100 wined3d: Use a wined3d_string_buffer to dump the intermediate shader code. Instead of abusing TRACE. There's probably still some room for improvement. There may also be value in dumping things in a format that's compatible with D3D shader assembly, but I don't think it's a priority. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 481 ++++++++++++++++++++++------------------- dlls/wined3d/shader_sm1.c | 2 - dlls/wined3d/wined3d_private.h | 4 - 3 files changed, 263 insertions(+), 224 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5719e9899ea5bd421b8f…

1 0

Henri Verbeet : wined3d: Use FIELD_OFFSET to calculate the size in surface_create_dib_section().
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 649d2dfb3b7ccfa689eb9fbce2f094fe5c03c738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649d2dfb3b7ccfa689eb9fbce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 18:52:20 2016 +0100 wined3d: Use FIELD_OFFSET to calculate the size in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 459cbdc..0e6bf28 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -379,17 +379,17 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) case 2: case 4: /* Allocate extra space to store the RGB bit masks. */ - b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD)); + b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(BITMAPINFO, bmiColors[3])); break; case 3: - b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER)); + b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(BITMAPINFO, bmiColors[0])); break; default: /* Allocate extra space for a palette. */ b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * (1u << (format->byte_count * 8))); + FIELD_OFFSET(BITMAPINFO, bmiColors[1u << (format->byte_count * 8)])); break; }

1 0

Alexandre Julliard : patches: Display a clear error mark for patches without a signoff.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: tools Branch: master Commit: 8e94784c2092a6f776a963c5a6d4be5083630aba URL: http://source.winehq.org/git/tools.git/?a=commit;h=8e94784c2092a6f776a963c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 14:00:13 2016 +0900 patches: Display a clear error mark for patches without a signoff. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/patches.css | 1 + patches/update | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/patches.css b/patches/patches.css index 091052d..020d48c 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -141,6 +141,7 @@ tr.odd { background-color: #f8e8e8; } .id, .status, .testbot { text-align: center; } .id, .status, .author { white-space: nowrap; padding: 0 3px; } .checkmark { text-align: center; color:green; } +.failmark { text-align: center; color: red; } .signoffextra { color: #A50D0D; border: 1px solid #601919; } .sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } diff --git a/patches/update b/patches/update index 86578d7..037297f 100755 --- a/patches/update +++ b/patches/update @@ -233,7 +233,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k } else { - printf INDEX "<td></td>"; + printf INDEX "<td class=\"failmark\">X</td>"; } if ($patch->{"testbot"} eq "Failed") {

1 0

Alistair Leslie-Hughes : include: Add IColumnsInfo interface.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 0f8a0fd4002f9d5d1cb6dadcb81ef430d8be21b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8a0fd4002f9d5d1cb6dadcb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 12 15:12:35 2016 +0300 include: Add IColumnsInfo interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 30 +++++++++++++++++++++++++ include/Makefile.in | 1 + include/colinf.idl | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dbs.idl | 28 ++++++++++++++++++++++++ include/oledb.idl | 1 + 5 files changed, 117 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 1243e48..ef0163a 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1513,3 +1513,33 @@ HRESULT CALLBACK IChapteredRowset_ReleaseChapter_Proxy(IChapteredRowset* This, H FIXME("(%p)->(%lx %p): stub\n", This, chapter, refcount); return E_NOTIMPL; } + +HRESULT CALLBACK IColumnsInfo_GetColumnInfo_Proxy(IColumnsInfo* This, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + FIXME("(%p)->(%p %p %p): stub\n", This, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IColumnsInfo_GetColumnInfo_Stub(IColumnsInfo* This, DBORDINAL *columns, DBCOLUMNINFO **col_info, + DBBYTEOFFSET **name_offsets, DBBYTEOFFSET **columnid_offsets, DBLENGTH *string_len, OLECHAR **stringsbuffer, + IErrorInfo **error) +{ + FIXME("(%p)->(%p %p %p %p %p %p %p): stub\n", This, columns, col_info, name_offsets, columnid_offsets, + string_len, stringsbuffer, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK IColumnsInfo_MapColumnIDs_Proxy(IColumnsInfo* This, DBORDINAL column_ids, const DBID *dbids, + DBORDINAL *columns) +{ + FIXME("(%p)->(%lu %p %p): stub\n", This, column_ids, dbids, columns); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IColumnsInfo_MapColumnIDs_Stub(IColumnsInfo* This, DBORDINAL column_ids, const DBID *dbids, + DBORDINAL *columns, IErrorInfo **error) +{ + FIXME("(%p)->(%lu %p %p %p): stub\n", This, column_ids, dbids, columns, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 129ff6d..010abe5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -24,6 +24,7 @@ IDL_SRCS = \ chprst.idl \ cmdbas.idl \ cmdtxt.idl \ + colinf.idl \ comcat.idl \ commoncontrols.idl \ control.idl \ diff --git a/include/colinf.idl b/include/colinf.idl new file mode 100644 index 0000000..0517153 --- /dev/null +++ b/include/colinf.idl @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2016 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a11-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IColumnsInfo : IUnknown +{ + [local] + HRESULT GetColumnInfo( + [in, out] DBORDINAL *columns, + [out, size_is(,(ULONG)*columns)] DBCOLUMNINFO **colinfo, + [out] OLECHAR **stringsbuffer); + + [call_as(GetColumnInfo)] + HRESULT RemoteGetColumnInfo([in, out] DBORDINAL *columns, + [out, size_is(,(ULONG)*columns)] DBCOLUMNINFO **colinfo, + [out, size_is(,(ULONG)*columns)] DBBYTEOFFSET **name_offsets, + [out, size_is(,(ULONG)*columns)] DBBYTEOFFSET **columnid_offsets, + [in, out] DBLENGTH *string_len, + [in, out, unique, size_is(,(ULONG)*string_len)] OLECHAR **stringsbuffer, + [out] IErrorInfo **errorinfo); + + [local] + HRESULT MapColumnIDs( + [in] DBORDINAL column_ids, + [in, size_is((ULONG)column_ids)] const DBID *dbids, + [out, size_is((ULONG)column_ids)] DBORDINAL *columns); + + [call_as(MapColumnIDs)] + HRESULT RemoteMapColumnIDs( + [in] DBORDINAL column_ids, + [in, size_is((ULONG)column_ids)] const DBID *dbids, + [out, size_is((ULONG)column_ids)] DBORDINAL *columns, + [out] IErrorInfo **errorinfo); +} diff --git a/include/dbs.idl b/include/dbs.idl index 2c46c2b..00e16f9 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -733,3 +733,31 @@ enum DBREASONENUM15 { DBREASON_ROWPOSITION_CLEARED, DBREASON_ROW_ASYNCHINSERT }; + +typedef DWORD DBCOLUMNFLAGS; + +enum DBCOLUMNFLAGSENUM { + DBCOLUMNFLAGS_ISBOOKMARK = 0x0001, + DBCOLUMNFLAGS_MAYDEFER = 0x0002, + DBCOLUMNFLAGS_WRITE = 0x0004, + DBCOLUMNFLAGS_WRITEUNKNOWN = 0x0008, + DBCOLUMNFLAGS_ISFIXEDLENGTH = 0x0010, + DBCOLUMNFLAGS_ISNULLABLE = 0x0020, + DBCOLUMNFLAGS_MAYBENULL = 0x0040, + DBCOLUMNFLAGS_ISLONG = 0x0080, + DBCOLUMNFLAGS_ISROWID = 0x0100, + DBCOLUMNFLAGS_ISROWVER = 0x0200, + DBCOLUMNFLAGS_CACHEDEFERRED = 0x1000 +}; + +typedef struct tagDBCOLUMNINFO { + LPOLESTR pwszName; + ITypeInfo *pTypeInfo; + DBORDINAL iOrdinal; + DBCOLUMNFLAGS dwFlags; + DBLENGTH ulColumnSize; + DBTYPE wType; + BYTE bPrecision; + BYTE bScale; + DBID columnid; +} DBCOLUMNINFO; diff --git a/include/oledb.idl b/include/oledb.idl index 8d7f001..537bb21 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -50,6 +50,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "chprst.idl" #include "cmdbas.idl" #include "cmdtxt.idl" +#include "colinf.idl" #include "dbccmd.idl" #include "dbcses.idl" #include "srcrst.idl"

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2016