November 2021 - Wine-Commits

Eric Pouech : dbghelp: Check that we don't add same line number twice.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: e105e9d35ee9f28f5a1615cd8f2b582ae8d82041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e105e9d35ee9f28f5a1615cd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:32 2021 +0100 dbghelp: Check that we don't add same line number twice. This happens (at least) in dwarf debug info where there could be two entries with same source file and line number, but different column numbers (and we don't store columns). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 7747aaae2ae..435d94bc8eb 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -418,6 +418,11 @@ void symt_add_func_line(struct module* module, struct symt_function* func, } vlen = vector_length(&func->vlines); prev = vlen ? vector_at(&func->vlines, vlen - 1) : NULL; + if (last_matches && prev && addr == prev->u.address) + { + WARN("Duplicate addition of line number in %s\n", func->hash_elt.name); + return; + } if (!last_matches) { /* we shouldn't have line changes on first line of function */

1 0

Eric Pouech : dbghelp: Attach a struct cpu* to every module.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: d72e6ac772ed7ae5160328992620944a38a145da URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72e6ac772ed7ae516032899… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:57:46 2021 +0100 dbghelp: Attach a struct cpu* to every module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 3 +++ dlls/dbghelp/module.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 61173b34b5a..1e77ed49225 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -430,6 +430,8 @@ struct module_format } u; }; +struct cpu; + struct module { struct process* process; @@ -438,6 +440,7 @@ struct module struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; + struct cpu* cpu; DWORD64 reloc_delta; WCHAR* real_path; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8168e727c52..65bdbb38fda 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -230,6 +230,9 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->addr_sorttab = NULL; module->num_sorttab = 0; module->num_symbols = 0; + module->cpu = cpu_find(machine); + if (!module->cpu) + module->cpu = dbghelp_current_cpu; vector_init(&module->vsymt, sizeof(struct symt*), 128); vector_init(&module->vcustom_symt, sizeof(struct symt*), 16);

1 0

Eric Pouech : dbghelp/pdb: Added support for S_INLINESITE and S_INLINESITE_END.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: cab92c90e07a1f80134d55687f936d35ac9334b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cab92c90e07a1f80134d5568… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:59:34 2021 +0100 dbghelp/pdb: Added support for S_INLINESITE and S_INLINESITE_END. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 241 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cab92c90e07a1f80134d…

1 0

Eric Pouech : dbghelp/pdb: Introduce codeview_init_type_parse() to handle init of type streams.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 54ec50d8598689e61036c32b2a550d88391a2ae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ec50d8598689e61036c32b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:59:07 2021 +0100 dbghelp/pdb: Introduce codeview_init_type_parse() to handle init of type streams. Currently used for TPI stream. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 87 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 0247a90f6ff..d7b1e74edcd 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2717,53 +2717,62 @@ static HANDLE map_pdb_file(const struct process* pcs, return hMap; } +static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg, + struct codeview_type_parse* ctp, + BYTE* image) +{ + PDB_TYPES types; + DWORD total; + const BYTE* ptr; + DWORD* offset; + + pdb_convert_types_header(&types, image); + + /* Check for unknown versions */ + switch (types.version) + { + case 19950410: /* VC 4.0 */ + case 19951122: + case 19961031: /* VC 5.0 / 6.0 */ + case 19990903: /* VC 7.0 */ + case 20040203: /* VC 8.0 */ + break; + default: + ERR("-Unknown type info version %d\n", types.version); + } + + ctp->module = msc_dbg->module; + /* reconstruct the types offset... + * FIXME: maybe it's present in the newest PDB_TYPES structures + */ + total = types.last_index - types.first_index + 1; + offset = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * total); + if (!offset) return FALSE; + ctp->table = ptr = image + types.type_offset; + ctp->num = 0; + while (ptr < ctp->table + types.type_size && ctp->num < total) + { + offset[ctp->num++] = ptr - ctp->table; + ptr += ((const union codeview_type*)ptr)->generic.len + 2; + } + ctp->offset = offset; + return TRUE; +} + static void pdb_process_types(const struct msc_debug_info* msc_dbg, const struct pdb_file_info* pdb_file) { - BYTE* types_image = NULL; + struct codeview_type_parse ctp; + BYTE* types_image = pdb_read_file(pdb_file, 2); - types_image = pdb_read_file(pdb_file, 2); if (types_image) { - PDB_TYPES types; - struct codeview_type_parse ctp; - DWORD total; - const BYTE* ptr; - DWORD* offset; - - pdb_convert_types_header(&types, types_image); - - /* Check for unknown versions */ - switch (types.version) + if (pdb_init_type_parse(msc_dbg, &ctp, types_image)) { - case 19950410: /* VC 4.0 */ - case 19951122: - case 19961031: /* VC 5.0 / 6.0 */ - case 19990903: /* VC 7.0 */ - case 20040203: /* VC 8.0 */ - break; - default: - ERR("-Unknown type info version %d\n", types.version); + /* Read type table */ + codeview_parse_type_table(&ctp); + HeapFree(GetProcessHeap(), 0, (DWORD*)ctp.offset); } - - ctp.module = msc_dbg->module; - /* reconstruct the types offset... - * FIXME: maybe it's present in the newest PDB_TYPES structures - */ - total = types.last_index - types.first_index + 1; - offset = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * total); - ctp.table = ptr = types_image + types.type_offset; - ctp.num = 0; - while (ptr < ctp.table + types.type_size && ctp.num < total) - { - offset[ctp.num++] = ptr - ctp.table; - ptr += ((const union codeview_type*)ptr)->generic.len + 2; - } - ctp.offset = offset; - - /* Read type table */ - codeview_parse_type_table(&ctp); - HeapFree(GetProcessHeap(), 0, offset); pdb_free(types_image); } }

1 0

Eric Pouech : dbghelp: Use cpu from debuggee's modules rather than debugger's.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 9f3e8a515f4f9359355ecd49eb0bbbb958e9ad0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f3e8a515f4f9359355ecd49… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:58:13 2021 +0100 dbghelp: Use cpu from debuggee's modules rather than debugger's. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 50 ++++++++++++++++++++++++++++---------------------- dlls/dbghelp/module.c | 6 +++--- dlls/dbghelp/stabs.c | 4 ++-- 3 files changed, 33 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f3e8a515f4f9359355e…

1 0

Alexandre Julliard : netapi32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 7693fb80912ad53128200515e236b71398a8e61f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7693fb80912ad53128200515… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:54:32 2021 +0100 netapi32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 4e77808cb86..8d61774b7d7 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -146,7 +146,7 @@ static NET_API_STATUS server_info_from_samba( DWORD level, const unsigned char * static NTSTATUS server_getinfo( void *args ) { - struct server_getinfo_params *params = args; + const struct server_getinfo_params *params = args; NET_API_STATUS status; char *samba_server = NULL; unsigned char *samba_buffer = NULL; @@ -707,7 +707,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne static NTSTATUS share_add( void *args ) { - struct share_add_params *params = args; + const struct share_add_params *params = args; char *samba_server = NULL; unsigned char *samba_info; NET_API_STATUS status; @@ -730,7 +730,7 @@ static NTSTATUS share_add( void *args ) static NTSTATUS share_del( void *args ) { - struct share_del_params *params = args; + const struct share_del_params *params = args; char *samba_server = NULL, *samba_share; NET_API_STATUS status; @@ -807,7 +807,7 @@ static NET_API_STATUS wksta_info_from_samba( DWORD level, const unsigned char *b static NTSTATUS wksta_getinfo( void *args ) { - struct wksta_getinfo_params *params = args; + const struct wksta_getinfo_params *params = args; unsigned char *samba_buffer = NULL; char *samba_server = NULL; NET_API_STATUS status; @@ -888,7 +888,7 @@ static NTSTATUS netapi_init( void *args ) static NTSTATUS change_password( void *args ) { - struct change_password_params *params = args; + const struct change_password_params *params = args; NET_API_STATUS ret = NERR_Success; static char option_silent[] = "-s"; static char option_user[] = "-U"; @@ -986,4 +986,123 @@ const unixlib_entry_t __wine_unix_call_funcs[] = change_password, }; +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_server_getinfo( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 buffer; + PTR32 size; + } const *params32 = args; + + struct server_getinfo_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->buffer), + ULongToPtr(params32->size) + }; + + return server_getinfo( &params ); +} + +static NTSTATUS wow64_share_add( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 info; + PTR32 err; + } const *params32 = args; + + struct share_add_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->info), + ULongToPtr(params32->err) + }; + + return share_add( &params ); +} + +static NTSTATUS wow64_share_del( void *args ) +{ + struct + { + PTR32 server; + PTR32 share; + DWORD reserved; + } const *params32 = args; + + struct share_del_params params = + { + ULongToPtr(params32->server), + ULongToPtr(params32->share), + params32->reserved + }; + + return share_del( &params ); +} + +static NTSTATUS wow64_wksta_getinfo( void *args ) +{ + struct + { + PTR32 server; + DWORD level; + PTR32 buffer; + PTR32 size; + } const *params32 = args; + + struct wksta_getinfo_params params = + { + ULongToPtr(params32->server), + params32->level, + ULongToPtr(params32->buffer), + ULongToPtr(params32->size) + }; + + return wksta_getinfo( &params ); +} + +static NTSTATUS wow64_change_password( void *args ) +{ + struct + { + PTR32 domain; + PTR32 user; + PTR32 old; + PTR32 new; + } const *params32 = args; + + struct change_password_params params = + { + ULongToPtr(params32->domain), + ULongToPtr(params32->user), + ULongToPtr(params32->old), + ULongToPtr(params32->new) + }; + + return change_password( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + netapi_init, + wow64_server_getinfo, + wow64_share_add, + wow64_share_del, + wow64_wksta_getinfo, + wow64_change_password, +}; + +#endif /* _WIN64 */ + #endif /* SONAME_LIBNETAPI */

1 0

Alexandre Julliard : avicap32: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 9f69a0ddaa2f33cf42fc0bd489f189f6c222ceab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f69a0ddaa2f33cf42fc0bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 8 20:53:24 2021 +0100 avicap32: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avicap32/v4l.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index 0b004e17e58..ef41b7e281b 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -134,4 +134,13 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_device_desc, }; +#ifdef _WIN64 + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + get_device_desc, +}; + +#endif /* _WIN64 */ + #endif /* HAVE_LINUX_VIDEODEV_2 */

1 0

Eric Pouech : dbghelp/pdb: Let codeview_snarf() handle all module debug information.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 3bc073d8bf9c417eac761a0f6e77500048a68e26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bc073d8bf9c417eac761a0f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 8 14:59:20 2021 +0100 dbghelp/pdb: Let codeview_snarf() handle all module debug information. Except old linetab v1. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 62 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d7b1e74edcd..12334a2e69d 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -90,6 +90,15 @@ struct pdb_module_info #define loc_cv_local_range (loc_user + 0) /* loc.offset contain the copy of all defrange* Codeview records following S_LOCAL */ +struct cv_module_snarf +{ + const struct codeview_type_parse* ipi_ctp; + const struct CV_DebugSSubsectionHeader_t* dbgsubsect; + unsigned dbgsubsect_size; + const char* strimage; + unsigned strsize; +}; + /*======================================================================== * Debug file access helper routines */ @@ -1468,11 +1477,11 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B } } -static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const BYTE* linetab, DWORD size, - const char* strimage, DWORD strsize) +static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const struct cv_module_snarf* cvmod) { unsigned i; DWORD_PTR addr; + const void* hdr_last = (const char*)cvmod->dbgsubsect + cvmod->dbgsubsect_size; const struct CV_DebugSSubsectionHeader_t* hdr; const struct CV_DebugSSubsectionHeader_t* hdr_next; const struct CV_DebugSSubsectionHeader_t* hdr_files = NULL; @@ -1484,15 +1493,13 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const struct symt_function* func; /* locate DEBUG_S_FILECHKSMS (if any) */ - hdr = (const struct CV_DebugSSubsectionHeader_t*)linetab; - while (CV_IS_INSIDE(hdr, linetab + size)) + for (hdr = cvmod->dbgsubsect; CV_IS_INSIDE(hdr, hdr_last); hdr = CV_RECORD_GAP(hdr, hdr->cbLen)) { if (hdr->type == DEBUG_S_FILECHKSMS) { hdr_files = hdr; break; } - hdr = CV_RECORD_GAP(hdr, hdr->cbLen); } if (!hdr_files) { @@ -1500,8 +1507,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const return; } - hdr = (const struct CV_DebugSSubsectionHeader_t*)linetab; - while (CV_IS_INSIDE(hdr, linetab + size)) + for (hdr = cvmod->dbgsubsect; CV_IS_INSIDE(hdr, hdr_last); hdr = hdr_next) { hdr_next = CV_RECORD_GAP(hdr, hdr->cbLen); if (!(hdr->type & DEBUG_S_IGNORE)) @@ -1524,7 +1530,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const break; } source = source_new(msc_dbg->module, NULL, - (chksms->strOffset < strsize) ? strimage + chksms->strOffset : "<<stroutofbounds>>"); + (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<stroutofbounds>>"); func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr); /* FIXME: at least labels support line numbers */ if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) @@ -1756,8 +1762,10 @@ static unsigned codeview_transform_defrange(const struct msc_debug_info* msc_dbg return len; } -static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root, - int offset, int size, BOOL do_globals) +static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, + const BYTE* root, unsigned offset, unsigned size, + const struct cv_module_snarf* cvmod, + BOOL do_globals) { struct symt_function* curr_func = NULL; int i, length; @@ -2220,7 +2228,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo break; } } - + if (cvmod) codeview_snarf_linetab2(msc_dbg, cvmod); return TRUE; } @@ -3011,6 +3019,8 @@ static BOOL pdb_process_internal(const struct process* pcs, PDB_SYMBOLS symbols; BYTE* globalimage; BYTE* modimage; + BYTE* ipi_image; + struct codeview_type_parse ipi_ctp; BYTE* file; int header_size = 0; PDB_STREAM_INDEXES* psi; @@ -3052,12 +3062,15 @@ static BOOL pdb_process_internal(const struct process* pcs, pdb_lookup, pdb_module_info, module_index); pdb_process_types(msc_dbg, pdb_file); + ipi_image = pdb_read_file(pdb_file, 4); + pdb_init_type_parse(msc_dbg, &ipi_ctp, ipi_image); + /* Read global symbol table */ globalimage = pdb_read_file(pdb_file, symbols.gsym_file); if (globalimage) { - codeview_snarf(msc_dbg, globalimage, 0, - pdb_get_file_size(pdb_file, symbols.gsym_file), FALSE); + codeview_snarf(msc_dbg, globalimage, 0, pdb_get_file_size(pdb_file, symbols.gsym_file), + NULL, FALSE); } /* Read per-module symbols' tables */ @@ -3074,19 +3087,18 @@ static BOOL pdb_process_internal(const struct process* pcs, modimage = pdb_read_file(pdb_file, sfile.file); if (modimage) { - if (sfile.symbol_size) - codeview_snarf(msc_dbg, modimage, sizeof(DWORD), - sfile.symbol_size, TRUE); - - if (sfile.lineno_size && sfile.lineno2_size) FIXME("Both line info present... only supporting first\n"); - if (sfile.lineno_size) + struct cv_module_snarf cvmod = {&ipi_ctp, (const void*)(modimage + sfile.symbol_size), sfile.lineno2_size, + files_image + 12, files_size}; + codeview_snarf(msc_dbg, modimage, sizeof(DWORD), sfile.symbol_size, + &cvmod, TRUE); + + if (sfile.lineno_size && sfile.lineno2_size) + FIXME("Both line info present... only supporting second\n"); + else if (sfile.lineno_size) codeview_snarf_linetab(msc_dbg, modimage + sfile.symbol_size, sfile.lineno_size, pdb_file->kind == PDB_JG); - else if (sfile.lineno2_size && files_image) - codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size, sfile.lineno2_size, - files_image + 12, files_size); pdb_free(modimage); } @@ -3101,6 +3113,8 @@ static BOOL pdb_process_internal(const struct process* pcs, pdb_get_file_size(pdb_file, symbols.gsym_file)); pdb_free(globalimage); } + HeapFree(GetProcessHeap(), 0, (DWORD*)ipi_ctp.offset); + pdb_free(ipi_image); } else pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image, @@ -3565,8 +3579,8 @@ static BOOL codeview_process_info(const struct process* pcs, if (ent->SubSection == sstAlignSym) { - codeview_snarf(msc_dbg, msc_dbg->root + ent->lfo, sizeof(DWORD), - ent->cb, TRUE); + codeview_snarf(msc_dbg, msc_dbg->root + ent->lfo, sizeof(DWORD), ent->cb, + NULL, TRUE); /* * Check the next and previous entry. If either is a

1 0

Alistair Leslie-Hughes : include: Add define SQL_OV_ODBC3_80.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: ef306b148f477611b89eff9f29bb8f21f718d433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef306b148f477611b89eff9f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 8 18:45:06 2021 +1100 include: Add define SQL_OV_ODBC3_80. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sqlext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sqlext.h b/include/sqlext.h index ba799a36bb3..51e76a5a856 100644 --- a/include/sqlext.h +++ b/include/sqlext.h @@ -64,6 +64,7 @@ extern "C" { #define SQL_OV_ODBC2 __MSABI_LONG(2U) #define SQL_OV_ODBC3 __MSABI_LONG(3U) +#define SQL_OV_ODBC3_80 __MSABI_LONG(380U) #endif #define SQL_ACCESS_MODE 101

1 0

Alistair Leslie-Hughes : include: Add trnjoi.idl.
by Alexandre Julliard Nov. 8, 2021

Nov. 8, 2021

Module: wine Branch: master Commit: 0977ce7cef28d135664a0ee4a18ee51eb30db363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0977ce7cef28d135664a0ee4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 8 21:29:08 2021 +1100 include: Add trnjoi.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 28 ++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnjoi.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8910070fbac..dc0f2261096 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1741,3 +1741,31 @@ HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithPar FIXME("(%p)->(%ld %p %p %p): stub\n", This, count, names, ordinals, error); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionJoin_GetOptionsObject_Stub(ITransactionJoin* This, + ITransactionOptions **options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_GetOptionsObject_Proxy(ITransactionJoin *This, + ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionJoin_JoinTransaction_Stub(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p, %p): stub\n", This, unk, level, flags, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index ff7aa1b0ff5..114440f8b39 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -712,6 +712,7 @@ SOURCES = \ tpcshrd.h \ traffic.h \ transact.idl \ + trnjoi.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index b889d72bc38..abd4d55069c 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -80,6 +80,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstupd.idl" #include "mulres.idl" #include "transact.idl" +#include "trnjoi.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnjoi.idl b/include/trnjoi.idl new file mode 100644 index 00000000000..fcc22ce5ea3 --- /dev/null +++ b/include/trnjoi.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2021 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(0c733a5e-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionJoin : IUnknown +{ + [local] + HRESULT GetOptionsObject(ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **error); + + [local] + HRESULT JoinTransaction(IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, ITransactionOptions *options); + + [call_as(JoinTransaction)] + HRESULT RemoteJoinTransaction([in, unique] IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, + [in] ITransactionOptions *options, [out] IErrorInfo **error); +}

1 0